Cleaning up the cleanup