Removed some dbgcode + comments