Remove diagnostic cruft