clean-up debug code