do some cleanups