Cleanup of debug code.