spec cleanups