break a long line

replaced old debug macros and removed a useless log message.

This is the same patch as before, but with more context added.