ENG-5975: Remove more debug code.