PR to clean up some unwanted specs and cleanup some invalid/bad references. 🙏