diff --git a/model/jpa/src/main/resources/META-INF/jpa-authz-changelog-2.0.0.xml b/model/jpa/src/main/resources/META-INF/jpa-changelog-authz-2.0.0.xml
similarity index 100%
rename from model/jpa/src/main/resources/META-INF/jpa-authz-changelog-2.0.0.xml
rename to model/jpa/src/main/resources/META-INF/jpa-changelog-authz-2.0.0.xml
diff --git a/model/jpa/src/main/resources/META-INF/jpa-changelog-2.0.0.xml b/model/jpa/src/main/resources/META-INF/jpa-changelog-authz-master.xml
similarity index 100%
rename from model/jpa/src/main/resources/META-INF/jpa-changelog-2.0.0.xml
rename to model/jpa/src/main/resources/META-INF/jpa-changelog-authz-master.xml
diff --git a/model/mongo/src/main/java/org/keycloak/authorization/mongo/adapter/PolicyAdapter.java b/model/mongo/src/main/java/org/keycloak/authorization/mongo/adapter/PolicyAdapter.java
index a993c94cf8..38cb87bf4e 100644
--- a/model/mongo/src/main/java/org/keycloak/authorization/mongo/adapter/PolicyAdapter.java
+++ b/model/mongo/src/main/java/org/keycloak/authorization/mongo/adapter/PolicyAdapter.java
@@ -6,20 +6,14 @@ import org.keycloak.authorization.model.Resource;
 import org.keycloak.authorization.model.ResourceServer;
 import org.keycloak.authorization.model.Scope;
 import org.keycloak.authorization.mongo.entities.PolicyEntity;
-import org.keycloak.authorization.mongo.entities.ResourceEntity;
-import org.keycloak.authorization.mongo.entities.ScopeEntity;
 import org.keycloak.connections.mongo.api.context.MongoStoreInvocationContext;
 import org.keycloak.models.mongo.keycloak.adapters.AbstractMongoAdapter;
 
-import java.util.HashSet;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import static javafx.scene.input.KeyCode.R;
-
 /**
  * @author <a href="mailto:psilva@redhat.com">Pedro Igor</a>
  */