ENG-4959: remove code not in use and unnecessary import.