Remove commented-out code and debug messages

@esvit I'm not sure if you forgot to remove these things, or you meant to leave them there. I'm sending this pr anyway, in case you forgot.