added addCleanup