Remove debug, cleanups