missed some cleanups