Disabled debug + little cleanup