Removed a bunch of old (and probably broken) debug code