diff --git a/src/core/Akka/IO/Tcp.cs b/src/core/Akka/IO/Tcp.cs
index 99695646f44..78996792f51 100644
--- a/src/core/Akka/IO/Tcp.cs
+++ b/src/core/Akka/IO/Tcp.cs
@@ -6,13 +6,10 @@
 //-----------------------------------------------------------------------
 
 using System;
-using System.Reflection;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
-using System.Net.Sockets;
-using System.Runtime.CompilerServices;
 using Akka.Actor;
 using Akka.Configuration;
 using Akka.Dispatch;
@@ -53,7 +50,8 @@ public override TcpExt CreateExtension(ExtendedActorSystem system)
 
         #region internal connection messages
         
-        internal abstract class SocketCompleted : INoSerializationVerificationNeeded { }
+        internal abstract class SocketCompleted : INoSerializationVerificationNeeded, IDeadLetterSuppression 
+        { }
 
         internal sealed class SocketSent : SocketCompleted
         {
diff --git a/src/core/Akka/IO/Udp.cs b/src/core/Akka/IO/Udp.cs
index 7fad220ca20..997ad1be1bc 100644
--- a/src/core/Akka/IO/Udp.cs
+++ b/src/core/Akka/IO/Udp.cs
@@ -6,7 +6,6 @@
 //-----------------------------------------------------------------------
 
 using System;
-using System.Reflection;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
@@ -14,6 +13,7 @@
 using System.Runtime.CompilerServices;
 using Akka.Actor;
 using Akka.Configuration;
+using Akka.Event;
 using Akka.IO.Buffers;
 
 namespace Akka.IO
@@ -34,7 +34,7 @@ public class Udp : ExtensionIdProvider<UdpExt>
     {
         #region internal connection messages
 
-        internal abstract class SocketCompleted : INoSerializationVerificationNeeded
+        internal abstract class SocketCompleted : INoSerializationVerificationNeeded, IDeadLetterSuppression
         {
             public ByteString Data { get; }
 
diff --git a/src/core/Akka/IO/UdpConnected.cs b/src/core/Akka/IO/UdpConnected.cs
index d47ebff5e88..e683e09b217 100644
--- a/src/core/Akka/IO/UdpConnected.cs
+++ b/src/core/Akka/IO/UdpConnected.cs
@@ -6,7 +6,6 @@
 //-----------------------------------------------------------------------
 
 using System;
-using System.Reflection;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
@@ -14,6 +13,7 @@
 using System.Runtime.CompilerServices;
 using Akka.Actor;
 using Akka.Configuration;
+using Akka.Event;
 using Akka.IO.Buffers;
 
 namespace Akka.IO
@@ -45,7 +45,7 @@ public class UdpConnected : ExtensionIdProvider<UdpConnectedExt>
         // SocketAsyncEventArgs should never leave the ReceiveAsync() method and the OnComplete callback. It should
         // be returned immediately to PreallocatedSocketEventAgrsPool so that the buffer can be safely pooled back.
         
-        internal abstract class SocketCompleted : INoSerializationVerificationNeeded
+        internal abstract class SocketCompleted : INoSerializationVerificationNeeded, IDeadLetterSuppression
         {
             public ByteString Data { get; }