Clean up debug code