[#2182] clean up debug code