diff --git a/federation/ldap/src/main/java/org/keycloak/services/resources/admin/TestLdapConnectionRealmAdminProvider.java b/federation/ldap/src/main/java/org/keycloak/services/resources/admin/TestLdapConnectionRealmAdminProvider.java
index 14c2a3c827..33746c5193 100644
--- a/federation/ldap/src/main/java/org/keycloak/services/resources/admin/TestLdapConnectionRealmAdminProvider.java
+++ b/federation/ldap/src/main/java/org/keycloak/services/resources/admin/TestLdapConnectionRealmAdminProvider.java
@@ -51,7 +51,7 @@ public class TestLdapConnectionRealmAdminProvider implements AdminRealmResourceP
 
     @Override
     public Object getResource(KeycloakSession session, RealmModel realm, AdminPermissionEvaluator auth, AdminEventBuilder adminEvent) {
-        return new TestLdapConnectionResource(realm, auth, adminEvent);
+        return new TestLdapConnectionResource(realm, auth);
     }
 
 }
diff --git a/federation/ldap/src/main/java/org/keycloak/services/resources/admin/TestLdapConnectionResource.java b/federation/ldap/src/main/java/org/keycloak/services/resources/admin/TestLdapConnectionResource.java
index aa07cc3593..176345749d 100644
--- a/federation/ldap/src/main/java/org/keycloak/services/resources/admin/TestLdapConnectionResource.java
+++ b/federation/ldap/src/main/java/org/keycloak/services/resources/admin/TestLdapConnectionResource.java
@@ -41,27 +41,16 @@ import javax.ws.rs.core.Response;
  * @version $Revision: 1 $
  */
 public class TestLdapConnectionResource {
-    private static final Logger logger = Logger.getLogger(TestLdapConnectionResource.class);
-
     protected RealmModel realm;
 
     protected AdminPermissionEvaluator auth;
 
-    protected AdminEventBuilder adminEvent;
-
-    @Context
-    protected ClientConnection clientConnection;
-
     @Context
     protected KeycloakSession session;
 
-    @Context
-    protected HttpHeaders headers;
-
-    public TestLdapConnectionResource(RealmModel realm, AdminPermissionEvaluator auth, AdminEventBuilder adminEvent) {
+    public TestLdapConnectionResource(RealmModel realm, AdminPermissionEvaluator auth) {
         this.auth = auth;
         this.realm = realm;
-        this.adminEvent = adminEvent;
     }
 
     /**
diff --git a/server-spi/src/main/resources/META-INF/services/org.keycloak.provider.Spi b/server-spi/src/main/resources/META-INF/services/org.keycloak.provider.Spi
index bdef3ed12c..ed23b179f3 100755
--- a/server-spi/src/main/resources/META-INF/services/org.keycloak.provider.Spi
+++ b/server-spi/src/main/resources/META-INF/services/org.keycloak.provider.Spi
@@ -34,7 +34,6 @@
 
 org.keycloak.locale.LocaleSelectorSPI
 org.keycloak.locale.LocaleUpdaterSPI
-org.keycloak.storage.UserStorageProviderSpi
 org.keycloak.theme.ThemeResourceSpi
 org.keycloak.theme.ThemeSelectorSpi
 org.keycloak.urls.HostnameSpi
\ No newline at end of file
diff --git a/services/src/main/java/org/keycloak/services/DefaultKeycloakSession.java b/services/src/main/java/org/keycloak/services/DefaultKeycloakSession.java
index e46c94ebc6..1127a9f799 100644
--- a/services/src/main/java/org/keycloak/services/DefaultKeycloakSession.java
+++ b/services/src/main/java/org/keycloak/services/DefaultKeycloakSession.java
@@ -162,6 +162,7 @@ public class DefaultKeycloakSession implements KeycloakSession {
     }
 
     @Override
+    @Deprecated
     public UserFederatedStorageProvider userFederatedStorage() {
         if (userFederatedStorageProvider == null) {
             userFederatedStorageProvider = getProvider(UserFederatedStorageProvider.class);