Removing extra debug stuff (again). I would add a debug on/off macro, but that's ugly and also there are many meanings of debug