For ENG-5865, remove commented out debug code