For ENG-5865, remove dead code that Ning found