Remove debug cruft