diff --git a/Drone/client.py b/Drone/client.py
index 3b8e9ea..3ec3b06 100644
--- a/Drone/client.py
+++ b/Drone/client.py
@@ -15,18 +15,10 @@ current_dir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentfra
 parent_dir = os.path.dirname(current_dir)
 sys.path.insert(0, parent_dir) 
 
-import messaging_lib as messaging
-
-logging.basicConfig(  # TODO all prints as logs
-    level=logging.DEBUG, # INFO
-    format="%(asctime)s [%(name)-7.7s] [%(threadName)-12.12s] [%(levelname)-5.5s]  %(message)s",
-    handlers=[
-        logging.FileHandler("client_logs.log"),
-        logging.StreamHandler(),
-    ])
-
 logger = logging.getLogger(__name__)
 
+import messaging_lib as messaging
+
 ConfigOption = collections.namedtuple("ConfigOption", ["section", "option", "value"])
 
 active_client = None  # maybe needs to be refactored
diff --git a/messaging_lib.py b/messaging_lib.py
index e23f422..64a44a7 100644
--- a/messaging_lib.py
+++ b/messaging_lib.py
@@ -12,13 +12,13 @@ try:
 except ImportError:
     import selectors2 as selectors
 
-import logging_lib
+#import logging_lib
 
 PendingRequest = collections.namedtuple("PendingRequest", ["value", "requested_value",  # "expires_on",
                                                            "callback", "callback_args", "callback_kwargs",
                                                            ])
-_logger = logging.getLogger(__name__)
-logger = logging_lib.Logger(_logger, True)
+logger = logging.getLogger(__name__)
+#logger = logging_lib.Logger(_logger, True)
 
 
 class MessageManager:
@@ -269,8 +269,7 @@ class ConnectionManager(object):
 
     def process_received(self, income_message):
         message_type = income_message.jsonheader["message-type"]
-        logger.debug("Received message! Header: {}, content: {}".format(
-            income_message.jsonheader, income_message.content))
+        logger.debug("Received message! Header: {}, content: {}".format(income_message.jsonheader, income_message.content))
 
         if message_type == "message":
             self._process_message(income_message)
@@ -348,8 +347,7 @@ class ConnectionManager(object):
             # Resource temporarily unavailable (errno EWOULDBLOCK)
             pass
         except Exception as error:
-            logger.warning("Attempt to send message {} to {} failed due error: {}".format(
-                self._send_buffer, self.addr, error))
+            logger.warning("Attempt to send message {} to {} failed due error: {}".format(self._send_buffer, self.addr, error))
 
             if not self.resume_queue:
                 self._send_buffer = b''