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 99%
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
index 6e5e30c3d3..1adb2d8194 100755
--- 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
@@ -18,8 +18,7 @@
   -->
 
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.2.xsd">
-    <!-- Authorization -->
-    <changeSet author="psilva@redhat.com" id="2.0.0">
+    <changeSet author="psilva@redhat.com" id="authz-2.0.0">
         <createTable tableName="RESOURCE_SERVER">
             <column name="ID" type="VARCHAR(36)">
                 <constraints nullable="false"/>
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 94%
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
index 72af496995..875893f8b3 100755
--- 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
@@ -18,5 +18,5 @@
   -->
 
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.2.xsd">
-    <include file="META-INF/jpa-authz-changelog-2.0.0.xml"/>
+    <include file="META-INF/jpa-changelog-authz-2.0.0.xml"/>
 </databaseChangeLog>
diff --git a/model/jpa/src/main/resources/META-INF/jpa-changelog-master.xml b/model/jpa/src/main/resources/META-INF/jpa-changelog-master.xml
index 131ce05672..c8abe490b9 100755
--- a/model/jpa/src/main/resources/META-INF/jpa-changelog-master.xml
+++ b/model/jpa/src/main/resources/META-INF/jpa-changelog-master.xml
@@ -32,5 +32,6 @@
     <include file="META-INF/jpa-changelog-1.9.0.xml"/>
     <include file="META-INF/jpa-changelog-1.9.1.xml"/>
     <include file="META-INF/jpa-changelog-1.9.2.xml"/>
-    <include file="META-INF/jpa-changelog-2.0.0.xml"/>
+
+    <include file="META-INF/jpa-changelog-authz-master.xml"/>
 </databaseChangeLog>
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>
  */