HDFS-4685-WIP: clean up unused imports.