Remove the cruft