ENG-5616-cleanup removed unused code