diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java
index 3d6035dc92e7..cb76dd61cf0c 100644
--- a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java
+++ b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java
@@ -497,27 +497,6 @@ private URI checkHost(URI uri)
         return uri;
     }
 
-    /**
-     * Returns a {@link Destination} for the given scheme, host and port.
-     * Applications may use {@link Destination}s to create {@link Connection}s
-     * that will be outside HttpClient's pooling mechanism, to explicitly
-     * control the connection lifecycle (in particular their termination with
-     * {@link Connection#close()}).
-     *
-     * @param scheme the destination scheme
-     * @param host the destination host
-     * @param port the destination port
-     * @return the destination
-     * @see #getDestinations()
-     * @deprecated use {@link #resolveDestination(Request)} instead
-     */
-    @Deprecated
-    public Destination getDestination(String scheme, String host, int port)
-    {
-        Origin origin = createOrigin(scheme, host, port);
-        return resolveDestination(new HttpDestination.Key(origin, null));
-    }
-
     public Destination resolveDestination(Request request)
     {
         Origin origin = createOrigin(request.getScheme(), request.getHost(), request.getPort());
diff --git a/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/modules/BasicAuthModule.java b/jetty-jaspi/src/test/java/org/eclipse/jetty/security/jaspi/BasicAuthModule.java
similarity index 97%
rename from jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/modules/BasicAuthModule.java
rename to jetty-jaspi/src/test/java/org/eclipse/jetty/security/jaspi/BasicAuthModule.java
index 16ed2106783e..d00b0f63d88f 100644
--- a/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/modules/BasicAuthModule.java
+++ b/jetty-jaspi/src/test/java/org/eclipse/jetty/security/jaspi/BasicAuthModule.java
@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-package org.eclipse.jetty.security.jaspi.modules;
+package org.eclipse.jetty.security.jaspi;
 
 import java.io.IOException;
 import java.util.Map;
@@ -31,11 +31,11 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.eclipse.jetty.http.HttpHeader;
+import org.eclipse.jetty.security.jaspi.modules.BaseAuthModule;
 import org.eclipse.jetty.util.log.Log;
 import org.eclipse.jetty.util.log.Logger;
 import org.eclipse.jetty.util.security.Constraint;
 
-@Deprecated
 public class BasicAuthModule extends BaseAuthModule
 {
     private static final Logger LOG = Log.getLogger(BasicAuthModule.class);
diff --git a/jetty-jaspi/src/test/resources/jaspi.xml b/jetty-jaspi/src/test/resources/jaspi.xml
index 23a2ba5c7ed0..1e31d2c996b4 100644
--- a/jetty-jaspi/src/test/resources/jaspi.xml
+++ b/jetty-jaspi/src/test/resources/jaspi.xml
@@ -10,7 +10,7 @@
             <protected>true</protected>
             <serverAuthContext>
                 <serverAuthModule>
-                    <className>org.eclipse.jetty.security.jaspi.modules.BasicAuthModule</className>
+                    <className>org.eclipse.jetty.security.jaspi.BasicAuthModule</className>
                     <options>
                        org.eclipse.jetty.security.jaspi.modules.RealmName=TestRealm
                     </options>
diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/SessionAuthentication.java b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/SessionAuthentication.java
index eaa66a0d81ab..d421434582c3 100644
--- a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/SessionAuthentication.java
+++ b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/SessionAuthentication.java
@@ -23,7 +23,6 @@
 import java.io.Serializable;
 import javax.servlet.http.HttpSession;
 import javax.servlet.http.HttpSessionActivationListener;
-import javax.servlet.http.HttpSessionBindingEvent;
 import javax.servlet.http.HttpSessionBindingListener;
 import javax.servlet.http.HttpSessionEvent;
 
@@ -113,16 +112,4 @@ public void sessionDidActivate(HttpSessionEvent se)
             _session = se.getSession();
         }
     }
-
-    @Override
-    @Deprecated
-    public void valueBound(HttpSessionBindingEvent event)
-    {
-    }
-
-    @Override
-    @Deprecated
-    public void valueUnbound(HttpSessionBindingEvent event)
-    {
-    }
 }