clean-up, remove debug code