CLean-up debug output.
WIP clean-up