Cleaned up debug code for an initial 1.0 release