Cleanup the cleanup