diff --git a/source/backend/engine/CarlaEngineOsc.cpp b/source/backend/engine/CarlaEngineOsc.cpp
index 9a7242f58..b81624409 100644
--- a/source/backend/engine/CarlaEngineOsc.cpp
+++ b/source/backend/engine/CarlaEngineOsc.cpp
@@ -350,17 +350,10 @@ int CarlaEngineOsc::handleMsgRegister(const bool isTCP, const int argc, const lo
     {
         const char* host = lo_address_get_hostname(source);
         const char* port = lo_address_get_port(source);
-        fControlData.source = lo_address_new_with_proto(isTCP ? LO_TCP : LO_UDP, host, port);
-    }
 
-    {
-        char* host = lo_url_get_hostname(url);
-        char* port = lo_url_get_port(url);
+        fControlData.source = lo_address_new_with_proto(isTCP ? LO_TCP : LO_UDP, host, port);
         fControlData.path   = carla_strdup_free(lo_url_get_path(url));
         fControlData.target = lo_address_new_with_proto(isTCP ? LO_TCP : LO_UDP, host, port);
-
-        std::free(host);
-        std::free(port);
     }
 
     for (uint i=0, count=fEngine->getCurrentPluginCount(); i < count; ++i)
diff --git a/source/carla_control.py b/source/carla_control.py
index db3ba4f5c..f6a894c2b 100755
--- a/source/carla_control.py
+++ b/source/carla_control.py
@@ -298,7 +298,6 @@ class CarlaControlServerThread(ServerThread):
 
     @make_method('/carla-control/set_parameter_value', 'iif')
     def set_parameter_value_callback(self, path, args):
-        print(path, args)
         pluginId, paramId, paramValue = args
 
         if paramId < 0:
@@ -355,7 +354,6 @@ class CarlaControlServerThread(ServerThread):
 
     @make_method('/carla-control/set_peaks', 'iffff')
     def set_peaks_callback(self, path, args):
-        print(path, args)
         pluginId, in1, in2, out1, out2 = args
         self.host._set_peaks(pluginId, in1, in2, out1, out2)