Added missing cleanups