Kill the cruft