Remove debug, cleanup