latest cleanups