Cleanded up debug material