Clean out the cruft