HDFS-2856: clean unused imports