SPARK-2636: remove unused imports