Ref #5 - Remove debug code