Remove debug code ...