Enabling atomic cleanup