clean up the cruft