diff --git a/spark-3.1-spanner-lib/src/main/java/com/google/cloud/spark/spanner/SpannerPartitionReader.java b/spark-3.1-spanner-lib/src/main/java/com/google/cloud/spark/spanner/SpannerPartitionReader.java
index 39e524b9..290d8785 100644
--- a/spark-3.1-spanner-lib/src/main/java/com/google/cloud/spark/spanner/SpannerPartitionReader.java
+++ b/spark-3.1-spanner-lib/src/main/java/com/google/cloud/spark/spanner/SpannerPartitionReader.java
@@ -15,13 +15,8 @@
 package com.google.cloud.spark.spanner;
 
 import java.io.IOException;
-import org.apache.spark.sql.catalyst.InternalRow;
-import org.apache.spark.sql.connector.read.Batch;
 import org.apache.spark.sql.connector.read.InputPartition;
 import org.apache.spark.sql.connector.read.PartitionReader;
-import org.apache.spark.sql.connector.read.Scan;
-import org.apache.spark.sql.types.StructType;
-import org.apache.spark.sql.util.CaseInsensitiveStringMap;
 
 public class SpannerPartitionReader<T> implements PartitionReader<T> {
   @Override
diff --git a/spark-3.1-spanner-lib/src/main/java/com/google/cloud/spark/spanner/SpannerScanBuilder.java b/spark-3.1-spanner-lib/src/main/java/com/google/cloud/spark/spanner/SpannerScanBuilder.java
index d89e53cb..157b987e 100644
--- a/spark-3.1-spanner-lib/src/main/java/com/google/cloud/spark/spanner/SpannerScanBuilder.java
+++ b/spark-3.1-spanner-lib/src/main/java/com/google/cloud/spark/spanner/SpannerScanBuilder.java
@@ -14,7 +14,6 @@
 
 package com.google.cloud.spark.spanner;
 
-import com.google.cloud.spanner.connection.ConnectionOptions;
 import org.apache.spark.sql.connector.read.Scan;
 import org.apache.spark.sql.connector.read.ScanBuilder;
 import org.apache.spark.sql.util.CaseInsensitiveStringMap;
diff --git a/spark-3.1-spanner-lib/src/main/java/com/google/cloud/spark/spanner/SpannerSpark.java b/spark-3.1-spanner-lib/src/main/java/com/google/cloud/spark/spanner/SpannerSpark.java
index 91210b13..27b57972 100644
--- a/spark-3.1-spanner-lib/src/main/java/com/google/cloud/spark/spanner/SpannerSpark.java
+++ b/spark-3.1-spanner-lib/src/main/java/com/google/cloud/spark/spanner/SpannerSpark.java
@@ -46,7 +46,6 @@
 import org.apache.spark.sql.connector.catalog.TableCapability;
 import org.apache.spark.sql.connector.catalog.TableProvider;
 import org.apache.spark.sql.connector.expressions.Transform;
-import org.apache.spark.sql.connector.read.PartitionReader;
 import org.apache.spark.sql.connector.read.ScanBuilder;
 import org.apache.spark.sql.types.StructType;
 import org.apache.spark.sql.util.CaseInsensitiveStringMap;
diff --git a/spark-3.1-spanner-lib/src/main/java/com/google/cloud/spark/spanner/SpannerTable.java b/spark-3.1-spanner-lib/src/main/java/com/google/cloud/spark/spanner/SpannerTable.java
index 3b05a346..68ca8a52 100644
--- a/spark-3.1-spanner-lib/src/main/java/com/google/cloud/spark/spanner/SpannerTable.java
+++ b/spark-3.1-spanner-lib/src/main/java/com/google/cloud/spark/spanner/SpannerTable.java
@@ -14,11 +14,11 @@
 
 package com.google.cloud.spark.spanner;
 
-import com.google.cloud.spanner.connection.Connection;
-import com.google.cloud.spanner.connection.ConnectionOptions;
 import com.google.cloud.spanner.ResultSet;
 import com.google.cloud.spanner.Statement;
 import com.google.cloud.spanner.Struct;
+import com.google.cloud.spanner.connection.Connection;
+import com.google.cloud.spanner.connection.ConnectionOptions;
 import java.util.Map;
 import java.util.Set;
 import org.apache.commons.lang3.StringUtils;
diff --git a/spark-3.1-spanner-lib/src/test/java/com/google/cloud/spark/spanner/SpannerSparkTest.java b/spark-3.1-spanner-lib/src/test/java/com/google/cloud/spark/spanner/SpannerSparkTest.java
index f9e63672..19a9d2c4 100644
--- a/spark-3.1-spanner-lib/src/test/java/com/google/cloud/spark/spanner/SpannerSparkTest.java
+++ b/spark-3.1-spanner-lib/src/test/java/com/google/cloud/spark/spanner/SpannerSparkTest.java
@@ -1,5 +1,9 @@
 package com.google.cloud.spark;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatCode;
+
+import com.google.api.gax.longrunning.OperationFuture;
 import com.google.cloud.spanner.CreateDatabaseMetadata;
 import com.google.cloud.spanner.Database;
 import com.google.cloud.spanner.DatabaseAdminClient;
@@ -9,35 +13,30 @@
 import java.util.Map;
 import org.apache.spark.sql.types.DataTypes;
 import org.apache.spark.sql.types.StructField;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatCode;
-
-import com.google.api.gax.longrunning.OperationFuture;
 import org.apache.spark.sql.types.StructType;
-import org.junit.Before;
 import org.junit.After;
+import org.junit.Before;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
 @RunWith(JUnit4.class)
 public class SpannerSparkTest {
 
-    String instanceId = "ins";
-    String databaseId = "db";
+  String instanceId = "ins";
+  String databaseId = "db";
 
-    @Before
-    public void setUp() throws Exception {
-      SpannerOptions opts = SpannerOptions.newBuilder().build();
-      Spanner spanner = opts.getService();
-      DatabaseAdminClient dbAdminClient = spanner.getDatabaseAdminClient();
-      // 1. Setup the tables with the Cloud Spanner emulator.
-      OperationFuture<Database, CreateDatabaseMetadata> op = dbAdminClient
-          .createDatabase(
-              instanceId,
-              databaseId,
-              Arrays.asList(
-                  "CREATE TABLE ATable (\n"
+  @Before
+  public void setUp() throws Exception {
+    SpannerOptions opts = SpannerOptions.newBuilder().build();
+    Spanner spanner = opts.getService();
+    DatabaseAdminClient dbAdminClient = spanner.getDatabaseAdminClient();
+    // 1. Setup the tables with the Cloud Spanner emulator.
+    OperationFuture<Database, CreateDatabaseMetadata> op = dbAdminClient
+         .createDatabase(
+             instanceId,
+             databaseId,
+             Arrays.asList(
+                "CREATE TABLE ATable (\n"
                 + " A INT64 NOT NULL,\n"
                 + " B STRING(100),\n"
                 + " C BYTES(MAX),\n"