Remove debug and crappy code