Remove debug messages and TODOs, undo hexadecimal fix

Deciding whether hexadecimal values shall be correctly represented with
the 0x prefix is up to upstream. This way it's at least not my fault if
something breaks downstream. Same for trailing whitespaces.