Squash the cleanup