diff --git a/opencga-catalog/src/main/java/org/opencb/opencga/catalog/db/mongodb/OrganizationMongoDBAdaptorFactory.java b/opencga-catalog/src/main/java/org/opencb/opencga/catalog/db/mongodb/OrganizationMongoDBAdaptorFactory.java
index 9884bbccc6..be76b21970 100644
--- a/opencga-catalog/src/main/java/org/opencb/opencga/catalog/db/mongodb/OrganizationMongoDBAdaptorFactory.java
+++ b/opencga-catalog/src/main/java/org/opencb/opencga/catalog/db/mongodb/OrganizationMongoDBAdaptorFactory.java
@@ -121,7 +121,7 @@ public class OrganizationMongoDBAdaptorFactory {
 
     private final NoteMongoDBAdaptor notesDBAdaptor;
     private final OrganizationMongoDBAdaptor organizationDBAdaptor;
-    private UserMongoDBAdaptor userDBAdaptor;
+    private final UserMongoDBAdaptor userDBAdaptor;
     private final ProjectMongoDBAdaptor projectDBAdaptor;
     private final StudyMongoDBAdaptor studyDBAdaptor;
     private final IndividualMongoDBAdaptor individualDBAdaptor;
diff --git a/opencga-core/src/main/java/org/opencb/opencga/core/models/federation/FederationServerCreateParams.java b/opencga-core/src/main/java/org/opencb/opencga/core/models/federation/FederationServerCreateParams.java
deleted file mode 100644
index 4f9eb24e16..0000000000
--- a/opencga-core/src/main/java/org/opencb/opencga/core/models/federation/FederationServerCreateParams.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.opencb.opencga.core.models.federation;
-
-import org.opencb.commons.annotations.DataField;
-import org.opencb.opencga.core.api.FieldConstants;
-
-public class FederationServerCreateParams {
-
-    @DataField(id = "id", required = true, indexed = true, unique = true, immutable = true,
-            description = FieldConstants.FEDERATION_CLIENT_ID_DESCRIPTION)
-    private String id;
-
-    @DataField(id = "description", description = FieldConstants.FEDERATION_CLIENT_DESCRIPTION_DESCRIPTION)
-    private String description;
-
-    @DataField(id = "email", description = FieldConstants.FEDERATION_CLIENT_EMAIL_DESCRIPTION)
-    private String email;
-
-    @DataField(id = "userId", description = FieldConstants.FEDERATION_CLIENT_USER_ID_DESCRIPTION)
-    private String userId;
-
-    public FederationServerCreateParams() {
-    }
-
-    public FederationServerCreateParams(String id, String description, String email, String userId) {
-        this.id = id;
-        this.description = description;
-        this.email = email;
-        this.userId = userId;
-    }
-
-    @Override
-    public String toString() {
-        final StringBuilder sb = new StringBuilder("FederationServerCreateParams{");
-        sb.append("id='").append(id).append('\'');
-        sb.append(", description='").append(description).append('\'');
-        sb.append(", email='").append(email).append('\'');
-        sb.append(", userId='").append(userId).append('\'');
-        sb.append('}');
-        return sb.toString();
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public FederationServerCreateParams setId(String id) {
-        this.id = id;
-        return this;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public FederationServerCreateParams setDescription(String description) {
-        this.description = description;
-        return this;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public FederationServerCreateParams setEmail(String email) {
-        this.email = email;
-        return this;
-    }
-
-    public String getUserId() {
-        return userId;
-    }
-
-    public FederationServerCreateParams setUserId(String userId) {
-        this.userId = userId;
-        return this;
-    }
-}