measure cleanups