Updated cleanups