cinder cleanups