Cleanup the debug code.
Cleanup the debug code.

Debugging was only used for initial testing and there is no interface
to enable it at runtime.  This change make the code a little bit
cleaner.

gpg/npth,gpg/npth