diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ZigBeeDongleEzsp.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ZigBeeDongleEzsp.java
index a929b01eb..eee980c33 100644
--- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ZigBeeDongleEzsp.java
+++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ZigBeeDongleEzsp.java
@@ -460,7 +460,7 @@ public ZigBeeStatus startup(boolean reinitialize) {
             logger.debug("EZSP dongle initialize done - response {}", initResponse);
         }
 
-        // print current security state to debug logs
+        // Print current security state to debug logs
         ncp.getCurrentSecurityState();
 
         scheduleNetworkStatePolling();
@@ -728,9 +728,7 @@ public void sendCommand(final int msgTag, final ZigBeeApsFrame apsFrame) {
 
             transaction = new EzspSingleResponseTransaction(emberMulticast, EzspSendMulticastResponse.class);
         } else {
-            logger.debug("EZSP message not sent: {}", apsFrame);
-            // ZigBeeGroupAddress groupAddress = (ZigBeeGroupAddress) zclCommand.getDestinationAddress();
-            // apsFrame.setGroupId(groupAddress.getGroupId());
+            logger.debug("EZSP message not sent as unknown address mode: {}", apsFrame);
             return;
         }
 
@@ -774,7 +772,7 @@ public void setZigBeeTransportReceive(ZigBeeTransportReceive zigbeeTransportRece
     @Override
     public void handlePacket(EzspFrame response) {
         if (response.getFrameId() != POLL_FRAME_ID) {
-            logger.debug("RX EZSP: " + response.toString());
+            logger.debug("RX EZSP: {}", response);
         }
 
         if (response instanceof EzspIncomingMessageHandler) {
diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshFrameHandler.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshFrameHandler.java
index 20f979501..32c4f0dcb 100644
--- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshFrameHandler.java
+++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshFrameHandler.java
@@ -257,8 +257,6 @@ public void run() {
 
                         if (exceptionCnt++ > 10) {
                             logger.error("AshFrameHandler exception count exceeded");
-                            // if (!close) {
-                            // frameHandler.error(e);
                             closeHandler = true;
                         }
                     } catch (final Exception e) {
@@ -697,7 +695,7 @@ public EzspFrame call() {
                 // Remove the listener
                 removeTransactionListener(this);
 
-                return ezspTransaction.getResponse();// response;
+                return ezspTransaction.getResponse();
             }
 
             @Override
@@ -715,7 +713,6 @@ public boolean transactionEvent(EzspFrameResponse ezspResponse) {
                 }
 
                 transactionComplete();
-                // response = request;
 
                 return true;
             }
diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/internal/spi/SpiFrameHandler.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/internal/spi/SpiFrameHandler.java
index 817fc7dec..e90ca2bbd 100644
--- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/internal/spi/SpiFrameHandler.java
+++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/internal/spi/SpiFrameHandler.java
@@ -689,7 +689,6 @@ private void removeTransactionListener(SpiListener listener) {
     @Override
     public Future<EzspFrame> sendEzspRequestAsync(final EzspTransaction ezspTransaction) {
         class TransactionWaiter implements Callable<EzspFrame>, SpiListener {
-            // private EzspFrame response = null;
             private boolean complete = false;
 
             @Override
@@ -787,7 +786,7 @@ interface SpiListener {
     }
 
     /**
-     * Wait for the requested {@link EzspFrameResponse} to be received
+     * Wait for the requested {@link EzspFrameResponse} to be received.
      *
      * @param eventClass Request {@link EzspFrameResponse} to wait for
      * @return response {@link Future} {@link EzspFrameResponse}