More commented debug code should be removed - do we need the above 2 lines anymore?