diff --git a/src/main/java/io/debezium/connector/vitess/connection/MessageDecoder.java b/src/main/java/io/debezium/connector/vitess/connection/MessageDecoder.java
index 2a9b227b..77198c54 100644
--- a/src/main/java/io/debezium/connector/vitess/connection/MessageDecoder.java
+++ b/src/main/java/io/debezium/connector/vitess/connection/MessageDecoder.java
@@ -5,12 +5,12 @@
  */
 package io.debezium.connector.vitess.connection;
 
+import java.time.Instant;
+
 import io.debezium.connector.vitess.Vgtid;
 
 import binlogdata.Binlogdata;
 
-import java.time.Instant;
-
 /** Decode VStream gRPC VEvent and process it with the ReplicationMessageProcessor. */
 public interface MessageDecoder {
 
diff --git a/src/test/java/io/debezium/connector/vitess/VitessReplicationConnectionIT.java b/src/test/java/io/debezium/connector/vitess/VitessReplicationConnectionIT.java
index 78a58b04..034fa989 100644
--- a/src/test/java/io/debezium/connector/vitess/VitessReplicationConnectionIT.java
+++ b/src/test/java/io/debezium/connector/vitess/VitessReplicationConnectionIT.java
@@ -10,7 +10,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.fail;
 
-import java.sql.Connection;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.ArrayList;
diff --git a/src/test/java/io/debezium/connector/vitess/connection/VStreamOutputMessageDecoderTest.java b/src/test/java/io/debezium/connector/vitess/connection/VStreamOutputMessageDecoderTest.java
index 3a8bc0d5..da905db5 100644
--- a/src/test/java/io/debezium/connector/vitess/connection/VStreamOutputMessageDecoderTest.java
+++ b/src/test/java/io/debezium/connector/vitess/connection/VStreamOutputMessageDecoderTest.java
@@ -8,6 +8,8 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import java.time.Instant;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -29,8 +31,6 @@
 
 import binlogdata.Binlogdata;
 
-import java.time.Instant;
-
 public class VStreamOutputMessageDecoderTest {
     private static final Logger LOGGER = LoggerFactory.getLogger(VStreamOutputMessageDecoderTest.class);
 
@@ -496,7 +496,6 @@ public void shouldSetRowEventsToCommitTimestamp() throws Exception {
         Vgtid newVgtid = Vgtid.of(VgtidTest.VGTID_JSON);
 
         // exercise SUT
-//        final boolean[] processed = { false };
         decoder.processMessage(
                 beginEvent,
                 (message, vgtid, isLastRowEventOfTransaction) -> {
@@ -541,7 +540,6 @@ public void shouldSetRowEventsToCommitTimestamp() throws Exception {
 
     @Test
     public void shouldSetOtherEventsToEventTimestamp() throws Exception {
-        // setup fixture
         Long expectedEventTimestamp = 1L;
         Long expectedCommitTimestamp = 2L;
         Binlogdata.VEvent otherEvent = Binlogdata.VEvent.newBuilder()