more deferred cleanups