clean up debug code and comments