Clean up debug crud