For ENG-5802, remove dead code