Get rid of cruft