Cleanup of debug messages in preparation for release