cleaning out the cruft