cleaning up the cruft