diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageConsumer.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageConsumer.java
index a437f76..7cec9b5 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageConsumer.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageConsumer.java
@@ -69,7 +69,6 @@
     protected final MessageQueue messageQueue;
     protected final Lock lock = new ReentrantLock();
     protected final Lock dispatchLock = new ReentrantLock();
-    protected final AtomicBoolean suspendedConnection = new AtomicBoolean();
     protected final AtomicReference<Throwable> failureCause = new AtomicReference<>();
     protected final MessageDeliverTask deliveryTask = new MessageDeliverTask();
 
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpFixedProducer.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpFixedProducer.java
index d54f1f4..3c79fd7 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpFixedProducer.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpFixedProducer.java
@@ -63,8 +63,6 @@
     private final Map<Object, InFlightSend> sent = new LinkedHashMap<Object, InFlightSend>();
     private final Map<Object, InFlightSend> blocked = new LinkedHashMap<Object, InFlightSend>();
 
-    private AsyncResult sendCompletionWatcher;
-
     private final AmqpConnection connection;
 
     public AmqpFixedProducer(AmqpSession session, JmsProducerInfo info, Sender sender) {
@@ -404,13 +402,6 @@
             // Put the message back to usable state following send complete
             envelope.getMessage().onSendComplete();
 
-            // Signal the watcher that all pending sends have completed if one is registered
-            // and both the in-flight sends and blocked sends have completed.
-            if (sendCompletionWatcher != null && sent.isEmpty() && blocked.isEmpty()) {
-                sendCompletionWatcher.onSuccess();
-                sendCompletionWatcher = null;
-            }
-
             // Once the pending sends queue is drained and all in-flight sends have been
             // settled we can propagate the close request.
             if (isAwaitingClose() && !isClosed() && blocked.isEmpty() && sent.isEmpty()) {