diff --git a/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2StreamEndPoint.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2StreamEndPoint.java
index 53bea9fab80a..705492611dad 100644
--- a/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2StreamEndPoint.java
+++ b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2StreamEndPoint.java
@@ -14,7 +14,6 @@
 package org.eclipse.jetty.http2;
 
 import java.io.IOException;
-import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.nio.BufferOverflowException;
 import java.nio.ByteBuffer;
@@ -54,30 +53,12 @@ public HTTP2StreamEndPoint(HTTP2Stream stream)
         this.stream = stream;
     }
 
-    @Override
-    public InetSocketAddress getLocalAddress()
-    {
-        SocketAddress local = getLocalSocketAddress();
-        if (local instanceof InetSocketAddress)
-            return (InetSocketAddress)local;
-        return null;
-    }
-
     @Override
     public SocketAddress getLocalSocketAddress()
     {
         return stream.getSession().getLocalSocketAddress();
     }
 
-    @Override
-    public InetSocketAddress getRemoteAddress()
-    {
-        SocketAddress remote = getRemoteSocketAddress();
-        if (remote instanceof InetSocketAddress)
-            return (InetSocketAddress)remote;
-        return null;
-    }
-
     @Override
     public SocketAddress getRemoteSocketAddress()
     {
diff --git a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/AbstractEndPoint.java b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/AbstractEndPoint.java
index 688663511f76..eccdca817878 100644
--- a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/AbstractEndPoint.java
+++ b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/AbstractEndPoint.java
@@ -14,7 +14,6 @@
 package org.eclipse.jetty.io;
 
 import java.io.IOException;
-import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.nio.ByteBuffer;
 import java.nio.channels.WritePendingException;
@@ -59,27 +58,9 @@ protected AbstractEndPoint(Scheduler scheduler)
         super(scheduler);
     }
 
-    @Override
-    public InetSocketAddress getLocalAddress()
-    {
-        SocketAddress local = getLocalSocketAddress();
-        if (local instanceof InetSocketAddress)
-            return (InetSocketAddress)local;
-        return null;
-    }
-
     @Override
     public abstract SocketAddress getLocalSocketAddress();
 
-    @Override
-    public InetSocketAddress getRemoteAddress()
-    {
-        SocketAddress remote = getRemoteSocketAddress();
-        if (remote instanceof InetSocketAddress)
-            return (InetSocketAddress)remote;
-        return null;
-    }
-
     @Override
     public abstract SocketAddress getRemoteSocketAddress();
 
diff --git a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/EndPoint.java b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/EndPoint.java
index f7b94b31d3a8..b715a8525ace 100644
--- a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/EndPoint.java
+++ b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/EndPoint.java
@@ -84,38 +84,22 @@ interface Wrapper
         EndPoint unwrap();
     }
 
-    /**
-     * @return The local InetSocketAddress to which this {@code EndPoint} is bound, or {@code null}
-     * if this {@code EndPoint} is not bound to a Socket address.
-     * @deprecated use {@link #getLocalSocketAddress()} instead
-     */
-    @Deprecated
-    InetSocketAddress getLocalAddress();
-
     /**
      * @return the local SocketAddress to which this {@code EndPoint} is bound or {@code null}
      * if this {@code EndPoint} is not bound to a Socket address.
      */
     default SocketAddress getLocalSocketAddress()
     {
-        return getLocalAddress();
+        return null;
     }
 
-    /**
-     * @return The remote InetSocketAddress to which this {@code EndPoint} is connected, or {@code null}
-     * if this {@code EndPoint} is not connected to a Socket address.
-     * @deprecated use {@link #getRemoteSocketAddress()} instead.
-     */
-    @Deprecated
-    InetSocketAddress getRemoteAddress();
-
     /**
      * @return The remote SocketAddress to which this {@code EndPoint} is connected, or {@code null}
      * if this {@code EndPoint} is not connected to a Socket address.
      */
     default SocketAddress getRemoteSocketAddress()
     {
-        return getRemoteAddress();
+        return null;
     }
 
     /**
diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/ProxyConnectionFactory.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/ProxyConnectionFactory.java
index 900e0162d20b..a660220853be 100644
--- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/ProxyConnectionFactory.java
+++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/ProxyConnectionFactory.java
@@ -879,30 +879,12 @@ public void setIdleTimeout(long idleTimeout)
             _endPoint.setIdleTimeout(idleTimeout);
         }
 
-        @Override
-        public InetSocketAddress getLocalAddress()
-        {
-            SocketAddress local = getLocalSocketAddress();
-            if (local instanceof InetSocketAddress)
-                return (InetSocketAddress)local;
-            return null;
-        }
-
         @Override
         public SocketAddress getLocalSocketAddress()
         {
             return _local;
         }
 
-        @Override
-        public InetSocketAddress getRemoteAddress()
-        {
-            SocketAddress remote = getRemoteSocketAddress();
-            if (remote instanceof InetSocketAddress)
-                return (InetSocketAddress)remote;
-            return null;
-        }
-
         @Override
         public SocketAddress getRemoteSocketAddress()
         {
diff --git a/jetty-core/jetty-unixdomain-server/src/test/java/org/eclipse/jetty/unixdomain/server/UnixDomainTest.java b/jetty-core/jetty-unixdomain-server/src/test/java/org/eclipse/jetty/unixdomain/server/UnixDomainTest.java
index e6155d012507..56485f5af072 100644
--- a/jetty-core/jetty-unixdomain-server/src/test/java/org/eclipse/jetty/unixdomain/server/UnixDomainTest.java
+++ b/jetty-core/jetty-unixdomain-server/src/test/java/org/eclipse/jetty/unixdomain/server/UnixDomainTest.java
@@ -52,7 +52,6 @@
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -103,12 +102,6 @@ public boolean handle(Request request, Response response, Callback callback)
                 SocketAddress remote = endPoint.getRemoteSocketAddress();
                 assertThat(remote, Matchers.instanceOf(UnixDomainSocketAddress.class));
 
-                // Verify that other address methods don't throw.
-                local = assertDoesNotThrow(endPoint::getLocalAddress);
-                assertNull(local);
-                remote = assertDoesNotThrow(endPoint::getRemoteAddress);
-                assertNull(remote);
-
                 assertDoesNotThrow(endPoint::toString);
 
                 callback.succeeded();
diff --git a/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/internal/MockEndpoint.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/internal/MockEndpoint.java
index 981df02eebce..617341f7d6f4 100644
--- a/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/internal/MockEndpoint.java
+++ b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/internal/MockEndpoint.java
@@ -14,7 +14,6 @@
 package org.eclipse.jetty.websocket.core.internal;
 
 import java.io.IOException;
-import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.nio.ByteBuffer;
 import java.nio.channels.ReadPendingException;
@@ -28,24 +27,12 @@ public class MockEndpoint implements EndPoint
 {
     public static final String NOT_SUPPORTED = "Not supported by MockEndPoint";
 
-    @Override
-    public InetSocketAddress getLocalAddress()
-    {
-        throw new UnsupportedOperationException(NOT_SUPPORTED);
-    }
-
     @Override
     public SocketAddress getLocalSocketAddress()
     {
         throw new UnsupportedOperationException(NOT_SUPPORTED);
     }
 
-    @Override
-    public InetSocketAddress getRemoteAddress()
-    {
-        throw new UnsupportedOperationException(NOT_SUPPORTED);
-    }
-
     @Override
     public SocketAddress getRemoteSocketAddress()
     {