refactor and remove excess imports (JAL-943)