Remove debug, all working