diff --git a/MQTTSNGateway/src/MQTTSNGWBrokerRecvTask.cpp b/MQTTSNGateway/src/MQTTSNGWBrokerRecvTask.cpp
index ed3fa70..c74d0d3 100644
--- a/MQTTSNGateway/src/MQTTSNGWBrokerRecvTask.cpp
+++ b/MQTTSNGateway/src/MQTTSNGWBrokerRecvTask.cpp
@@ -142,19 +142,6 @@ void BrokerRecvTask::run(void)
 											ERRMSG_FOOTER);
 									client->getNetwork()->close();
 									client->disconnected();
-
-									/*
-                                    client->getNetwork()->close();
-                                    delete packet;
-
-
-                                    if (client)
-                                    {
-                                        client = client->getNextClient();
-                                    }
-                                    continue;
-									 */
-
                                 }
                                 else if (rc == -1)
                                 {
@@ -188,14 +175,6 @@ void BrokerRecvTask::run(void)
                                                 || client->isSleep()
                                                 || client->isAwake()))
                                 {
-                                    /* disconnect the client */
-									/*
-                                    packet = new MQTTGWPacket();
-                                    packet->setHeader(DISCONNECT);
-                                    ev = new Event();
-                                    ev->setBrokerRecvEvent(client, packet);
-                                    _gateway->getPacketEventQue()->post(ev);
-									 */
 									client->getNetwork()->close();
 									client->disconnected();
                                 }
diff --git a/MQTTSNGateway/src/MQTTSNGWClientRecvTask.cpp b/MQTTSNGateway/src/MQTTSNGWClientRecvTask.cpp
index c399696..ae7aeee 100644
--- a/MQTTSNGateway/src/MQTTSNGWClientRecvTask.cpp
+++ b/MQTTSNGateway/src/MQTTSNGWClientRecvTask.cpp
@@ -166,10 +166,8 @@ void ClientRecvTask::run()
 
 			if (client->isDisconnect() && packet->getType() != MQTTSN_CONNECT)
 			{
-				WRITELOG(
-						"%s MQTTSNGWClientRecvTask %s is not connecting.%s\n",
-						ERRMSG_HEADER,
-						client->getClientId(), ERRMSG_FOOTER);
+				WRITELOG("%s MQTTSNGWClientRecvTask %s is not connecting.%s\n",
+				ERRMSG_HEADER, client->getClientId(), ERRMSG_FOOTER);
 
 				/* send DISCONNECT to the client, if it is not connected */
 				MQTTSNPacket* snPacket = new MQTTSNPacket();
@@ -268,8 +266,8 @@ void ClientRecvTask::run()
 				{
 					WRITELOG(
 							"%s MQTTSNGWClientRecvTask  Client(%s) is not connecting. message has been discarded.%s\n",
-							ERRMSG_HEADER,
-							senderAddr->sprint(buf), ERRMSG_FOOTER);
+							ERRMSG_HEADER, senderAddr->sprint(buf),
+							ERRMSG_FOOTER);
 				}
 				delete packet;
 			}