Nuke unnecessary clean-up