diff --git a/adapter-s4r/src/main/java/io/nosqlbench/adapter/s4r/dispensers/AmqpMsgSendOpDispenser.java b/adapter-s4r/src/main/java/io/nosqlbench/adapter/s4r/dispensers/AmqpMsgSendOpDispenser.java
index 7f7580ffd..803da6fb5 100644
--- a/adapter-s4r/src/main/java/io/nosqlbench/adapter/s4r/dispensers/AmqpMsgSendOpDispenser.java
+++ b/adapter-s4r/src/main/java/io/nosqlbench/adapter/s4r/dispensers/AmqpMsgSendOpDispenser.java
@@ -16,7 +16,6 @@
 
 package io.nosqlbench.adapter.s4r.dispensers;
 
-import com.rabbitmq.client.AMQP;
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.Connection;
 import io.nosqlbench.adapter.s4r.S4RSpace;
@@ -41,10 +40,10 @@ public class AmqpMsgSendOpDispenser extends AmqpBaseOpDispenser {
 
     private final static Logger logger = LogManager.getLogger("AmqpMsgSendOpDispenser");
 
-    private boolean publisherConfirm ;
+    private final boolean publisherConfirm ;
     // Only relevant when 'publisherConfirm' is true
     // - default to "individual" confirm
-    private String confirmMode;
+    private final String confirmMode;
 
     // Only relevant when 'publisherConfirm' is true and 'confirmMode' is 'batch'
     // - default to 100
@@ -103,7 +102,7 @@ public class AmqpMsgSendOpDispenser extends AmqpBaseOpDispenser {
             new S4RSpace.AmqpSenderChannelKey(connSeqNum, channelSeqNum, senderSeqNum);
 
         return s4rSpace.getAmqpSenderChannel(amqpConnChannelKey, () -> {
-            Channel channel = null;
+            Channel channel;
 
             try {
                 channel = getChannelWithExchange(
@@ -156,7 +155,7 @@ public class AmqpMsgSendOpDispenser extends AmqpBaseOpDispenser {
             throw new S4RAdapterInvalidParamException("Message payload must be specified and can't be empty!");
         }
 
-        Channel channel = null;
+        Channel channel;
         String exchangeName = getEffectiveExchangeName(cycle);
 
         try {
diff --git a/adapter-s4r/src/main/java/io/nosqlbench/adapter/s4r/ops/S4RTimeTrackOp.java b/adapter-s4r/src/main/java/io/nosqlbench/adapter/s4r/ops/S4RTimeTrackOp.java
index a6726627f..ac822f48a 100644
--- a/adapter-s4r/src/main/java/io/nosqlbench/adapter/s4r/ops/S4RTimeTrackOp.java
+++ b/adapter-s4r/src/main/java/io/nosqlbench/adapter/s4r/ops/S4RTimeTrackOp.java
@@ -22,8 +22,6 @@ import io.nosqlbench.adapter.s4r.S4RSpace;
 import io.nosqlbench.adapter.s4r.util.S4RAdapterMetrics;
 import io.nosqlbench.engine.api.activityimpl.uniform.flowtypes.CycleOp;
 
-import java.io.IOException;
-
 public abstract class S4RTimeTrackOp implements CycleOp<Object> {
     private final S4RAdapterMetrics s4rAdapterMetrics;
     protected final S4RSpace s4RSpace;