ENG-6472, removed unused imports and empty line