Remove debug and extra cruft