Cleanning up debug code