diff --git a/osal/windows/TmTcWinUdpBridge.cpp b/osal/windows/TmTcWinUdpBridge.cpp
index d2b2b2ec..8b19b59e 100644
--- a/osal/windows/TmTcWinUdpBridge.cpp
+++ b/osal/windows/TmTcWinUdpBridge.cpp
@@ -11,22 +11,15 @@
 const std::string TmTcWinUdpBridge::DEFAULT_UDP_SERVER_PORT =  "7301";
 const std::string TmTcWinUdpBridge::DEFAULT_UDP_CLIENT_PORT =  "7302";
 
-TmTcWinUdpBridge::TmTcWinUdpBridge(object_id_t objectId,
-        object_id_t tcDestination, object_id_t tmStoreId, object_id_t tcStoreId,
-        std::string udpServerPort, std::string udpClientPort):
+TmTcWinUdpBridge::TmTcWinUdpBridge(object_id_t objectId, object_id_t tcDestination,
+        object_id_t tmStoreId, object_id_t tcStoreId, std::string udpServerPort):
         TmTcBridge(objectId, tcDestination, tmStoreId, tcStoreId) {
     if(udpServerPort == "") {
-         this->udpServerPort = DEFAULT_UDP_SERVER_PORT;
+        this->udpServerPort = DEFAULT_UDP_SERVER_PORT;
     }
     else {
         this->udpServerPort = udpServerPort;
     }
-    if(udpClientPort == "") {
-        this->udpClientPort = DEFAULT_UDP_CLIENT_PORT;
-    }
-    else {
-        this->udpClientPort = udpClientPort;
-    }
 
     mutex = MutexFactory::instance()->createMutex();
     communicationLinkUp = false;
diff --git a/osal/windows/TmTcWinUdpBridge.h b/osal/windows/TmTcWinUdpBridge.h
index 5cae308d..603f2b08 100644
--- a/osal/windows/TmTcWinUdpBridge.h
+++ b/osal/windows/TmTcWinUdpBridge.h
@@ -13,8 +13,7 @@ public:
     static const std::string DEFAULT_UDP_CLIENT_PORT;
 
     TmTcWinUdpBridge(object_id_t objectId, object_id_t tcDestination,
-            object_id_t tmStoreId, object_id_t tcStoreId,
-            std::string udpServerPort = "", std::string udpClientPort = "");
+            object_id_t tmStoreId, object_id_t tcStoreId, std::string udpServerPort = "");
     virtual~ TmTcWinUdpBridge();
 
     /**
@@ -32,16 +31,10 @@ protected:
 private:
     SOCKET serverSocket = 0;
     std::string udpServerPort;
-    std::string udpClientPort;
-
-    const int serverSocketOptions = 0;
 
     struct sockaddr_in clientAddress;
     int clientAddressLen = 0;
 
-    struct sockaddr_in serverAddress;
-    int serverAddressLen = 0;
-
     //! Access to the client address is mutex protected as it is set by another task.
     MutexIF::TimeoutType timeoutType = MutexIF::TimeoutType::WAITING;
     dur_millis_t mutexTimeoutMs = 20;