removing the cruft