diff --git a/mROA/Abstract/IInteractionModule.cs b/mROA/Abstract/IInteractionModule.cs
index 5459266..53cd7ab 100644
--- a/mROA/Abstract/IInteractionModule.cs
+++ b/mROA/Abstract/IInteractionModule.cs
@@ -9,7 +9,6 @@ namespace mROA.Abstract
     {
         int ConnectionId { get; set; }
         public Stream? BaseStream { get; set; }
-        public IntPtr StreamHandle { get; set; }
         Task<NetworkMessageHeader> GetNextMessageReceiving(bool infinite = true);
         Task PostMessageAsync(NetworkMessageHeader messageHeader);
         void HandleMessage(NetworkMessageHeader messageHeader);
diff --git a/mROA/Implementation/Backend/NetworkGatewayModule.cs b/mROA/Implementation/Backend/NetworkGatewayModule.cs
index 303cffc..cee7453 100644
--- a/mROA/Implementation/Backend/NetworkGatewayModule.cs
+++ b/mROA/Implementation/Backend/NetworkGatewayModule.cs
@@ -73,7 +73,6 @@ namespace mROA.Implementation.Backend
 
                 interaction!.Inject(_serialization);
                 interaction.BaseStream = client.GetStream();
-                interaction.StreamHandle = client.Client.Handle;
 
                 var connectionRequest = interaction.GetNextMessageReceiving(false)
                     .GetAwaiter().GetResult()!;
@@ -91,7 +90,6 @@ namespace mROA.Implementation.Backend
                         var recoveryRequest = _serialization!.Deserialize<ClientRecovery>(connectionRequest.Data)!;
                         var recoveryInteraction = _hub.GetInteraction(recoveryRequest.Id);
                         recoveryInteraction.BaseStream = client.GetStream();
-                        recoveryInteraction.StreamHandle = client.Client.Handle;
                         
                         recoveryInteraction.Restart(false);
                         Console.WriteLine("Connection recovery for client {0} finished", recoveryRequest.Id);
diff --git a/mROA/Implementation/NextGenerationInteractionModule.cs b/mROA/Implementation/NextGenerationInteractionModule.cs
index 254457c..8565d65 100644
--- a/mROA/Implementation/NextGenerationInteractionModule.cs
+++ b/mROA/Implementation/NextGenerationInteractionModule.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Net.Sockets;
 using System.Threading.Tasks;
 using mROA.Abstract;
 
@@ -27,14 +26,7 @@ namespace mROA.Implementation
         }
 
         public int ConnectionId { get; set; }
-
-        public Stream? BaseStream
-        {
-            get => _baseStream;
-            set => _baseStream = value;
-        }
-
-        public IntPtr StreamHandle { get; set; }
+        public Stream? BaseStream { get; set; }
 
 
         public void Inject<T>(T dependency)
@@ -63,7 +55,7 @@ namespace mROA.Implementation
         {
 #if TRACE
             Console.WriteLine(
-                $"{DateTime.Now.TimeOfDay} Posting message to {StreamHandle}: {messageHeader.Id} - {messageHeader.MessageType} to {ConnectionId}");
+                $"{DateTime.Now.TimeOfDay} Posting message: {messageHeader.Id} - {messageHeader.MessageType} to {ConnectionId}");
 #endif
 
             var rawMessage = _serialization.Serialize(messageHeader);
@@ -178,7 +170,7 @@ namespace mROA.Implementation
 
             var message = _serialization.Deserialize<NetworkMessageHeader>(localSpan.Span);
 #if TRACE
-            Console.WriteLine($"{DateTime.Now.TimeOfDay} Received Message from {StreamHandle} {message.Id} - {message.MessageType}");
+            Console.WriteLine($"{DateTime.Now.TimeOfDay} Received Message {message.Id} - {message.MessageType}");
             TransmissionConfig.TotalTransmittedBytes += len;
             Console.WriteLine($"Total received bytes are {TransmissionConfig.TotalTransmittedBytes}");
 #endif