HDFS-6099: clean unused imports