Cleaning out the cruft