Get rid of debug cruft