diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/PrismValueDeltaSetTriple.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/PrismValueDeltaSetTriple.java
index 02122d4fc22..6c7838dab16 100644
--- a/infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/PrismValueDeltaSetTriple.java
+++ b/infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/PrismValueDeltaSetTriple.java
@@ -23,7 +23,6 @@
 import com.evolveum.midpoint.prism.Visitable;
 import com.evolveum.midpoint.prism.Visitor;
 import com.evolveum.midpoint.prism.polystring.PolyString;
-import com.evolveum.midpoint.util.Cloner;
 import com.evolveum.midpoint.util.DebugDumpable;
 import com.evolveum.midpoint.util.Processor;
 import com.evolveum.midpoint.util.exception.SchemaException;
diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/AndFilter.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/AndFilter.java
index 9450b50b699..360b89913a6 100644
--- a/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/AndFilter.java
+++ b/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/AndFilter.java
@@ -16,18 +16,9 @@
 
 package com.evolveum.midpoint.prism.query;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import com.evolveum.midpoint.prism.Containerable;
-import com.evolveum.midpoint.prism.Objectable;
 import com.evolveum.midpoint.prism.PrismConstants;
 import com.evolveum.midpoint.prism.PrismContainerValue;
-import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.prism.match.MatchingRuleRegistry;
-import com.evolveum.midpoint.util.DebugUtil;
 import com.evolveum.midpoint.util.exception.SchemaException;
 
 import javax.xml.namespace.QName;
diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ComparativeFilter.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ComparativeFilter.java
index e242af652f8..8ae55ba630a 100644
--- a/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ComparativeFilter.java
+++ b/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ComparativeFilter.java
@@ -27,8 +27,6 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import javax.xml.namespace.QName;
-
 public abstract class ComparativeFilter<T extends Object> extends PropertyValueFilter<T> {
 
 	private boolean equals;
diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/GreaterFilter.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/GreaterFilter.java
index 87a29a30d4b..85c6e34cc43 100644
--- a/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/GreaterFilter.java
+++ b/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/GreaterFilter.java
@@ -17,15 +17,11 @@
 
 import com.evolveum.midpoint.prism.ExpressionWrapper;
 import com.evolveum.midpoint.prism.ItemDefinition;
-import com.evolveum.midpoint.prism.PrismContainerValue;
 
 import com.evolveum.midpoint.prism.PrismContext;
 import com.evolveum.midpoint.prism.PrismPropertyDefinition;
 import com.evolveum.midpoint.prism.PrismPropertyValue;
-import com.evolveum.midpoint.prism.match.MatchingRuleRegistry;
 import com.evolveum.midpoint.prism.path.ItemPath;
-import com.evolveum.midpoint.util.DebugUtil;
-import com.evolveum.midpoint.util.exception.SchemaException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/NaryLogicalFilter.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/NaryLogicalFilter.java
index e1ffc4aa772..b688e094547 100644
--- a/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/NaryLogicalFilter.java
+++ b/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/NaryLogicalFilter.java
@@ -18,8 +18,6 @@
 
 import java.util.List;
 
-import com.evolveum.midpoint.util.DebugUtil;
-
 public abstract class NaryLogicalFilter extends LogicalFilter {
 	
 	public NaryLogicalFilter() {
diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/NotFilter.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/NotFilter.java
index 559a144678d..4e5556b3c8a 100644
--- a/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/NotFilter.java
+++ b/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/NotFilter.java
@@ -18,7 +18,6 @@
 
 import com.evolveum.midpoint.prism.PrismContainerValue;
 import com.evolveum.midpoint.prism.match.MatchingRuleRegistry;
-import com.evolveum.midpoint.util.DebugUtil;
 import com.evolveum.midpoint.util.exception.SchemaException;
 
 
diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/OrFilter.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/OrFilter.java
index 033bc39fe38..30fee2c0322 100644
--- a/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/OrFilter.java
+++ b/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/OrFilter.java
@@ -22,7 +22,6 @@
 
 import com.evolveum.midpoint.prism.PrismContainerValue;
 import com.evolveum.midpoint.prism.match.MatchingRuleRegistry;
-import com.evolveum.midpoint.util.DebugUtil;
 import com.evolveum.midpoint.util.exception.SchemaException;
 
 public class OrFilter extends NaryLogicalFilter {
diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/PropertyValueFilter.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/PropertyValueFilter.java
index 5b43e02dc10..743fc5f4f21 100644
--- a/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/PropertyValueFilter.java
+++ b/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/PropertyValueFilter.java
@@ -22,13 +22,8 @@
 
 import com.evolveum.midpoint.prism.*;
 
-import org.apache.commons.lang.Validate;
-
-import com.evolveum.midpoint.prism.match.MatchingRuleRegistry;
 import com.evolveum.midpoint.prism.path.ItemPath;
 import com.evolveum.midpoint.prism.util.PrismUtil;
-import com.evolveum.midpoint.util.DebugUtil;
-import com.evolveum.midpoint.util.exception.SchemaException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/builder/QueryBuilder.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/builder/QueryBuilder.java
index 76a1c2ca8c5..dbebc9b1b16 100644
--- a/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/builder/QueryBuilder.java
+++ b/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/builder/QueryBuilder.java
@@ -19,7 +19,6 @@
 import com.evolveum.midpoint.prism.ComplexTypeDefinition;
 import com.evolveum.midpoint.prism.Containerable;
 import com.evolveum.midpoint.prism.PrismContext;
-import com.evolveum.midpoint.util.exception.SchemaException;
 
 /**
  * Here is the language structure:
diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/builder/S_AtomicFilterExit.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/builder/S_AtomicFilterExit.java
index 80193e9460c..08377cb90ed 100644
--- a/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/builder/S_AtomicFilterExit.java
+++ b/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/builder/S_AtomicFilterExit.java
@@ -16,8 +16,6 @@
 
 package com.evolveum.midpoint.prism.query.builder;
 
-import com.evolveum.midpoint.util.exception.SchemaException;
-
 /**
  * @author mederly
  */
diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/builder/S_ConditionEntry.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/builder/S_ConditionEntry.java
index 5942feea647..319409fbbd6 100644
--- a/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/builder/S_ConditionEntry.java
+++ b/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/builder/S_ConditionEntry.java
@@ -16,10 +16,8 @@
 
 package com.evolveum.midpoint.prism.query.builder;
 
-import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.prism.PrismProperty;
 import com.evolveum.midpoint.prism.PrismReferenceValue;
-import com.evolveum.midpoint.util.exception.SchemaException;
 
 import javax.xml.namespace.QName;
 import java.util.Collection;
diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/builder/S_RightHandItemEntry.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/builder/S_RightHandItemEntry.java
index 047019d8f32..36eb49dd347 100644
--- a/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/builder/S_RightHandItemEntry.java
+++ b/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/builder/S_RightHandItemEntry.java
@@ -18,7 +18,6 @@
 
 import com.evolveum.midpoint.prism.ItemDefinition;
 import com.evolveum.midpoint.prism.path.ItemPath;
-import com.evolveum.midpoint.util.exception.SchemaException;
 
 import javax.xml.namespace.QName;
 
diff --git a/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java b/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
index 81150fa2f26..20cd9de9c72 100644
--- a/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
+++ b/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
@@ -48,7 +48,6 @@
 import com.evolveum.midpoint.prism.delta.ItemDelta;
 import com.evolveum.midpoint.prism.delta.ObjectDelta;
 import com.evolveum.midpoint.prism.delta.PropertyDelta;
-import com.evolveum.midpoint.prism.delta.ReferenceDelta;
 import com.evolveum.midpoint.prism.delta.builder.DeltaBuilder;
 import com.evolveum.midpoint.prism.match.MatchingRule;
 import com.evolveum.midpoint.prism.match.MatchingRuleRegistry;
@@ -74,10 +73,6 @@
 import com.evolveum.midpoint.schema.internals.InternalMonitor;
 import com.evolveum.midpoint.schema.internals.InternalsConfig;
 import com.evolveum.midpoint.schema.processor.*;
-import com.evolveum.midpoint.schema.processor.ObjectClassComplexTypeDefinition;
-import com.evolveum.midpoint.schema.processor.ResourceAttribute;
-import com.evolveum.midpoint.schema.processor.ResourceAttributeContainer;
-import com.evolveum.midpoint.schema.processor.ResourceAttributeDefinition;
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.schema.result.OperationResultStatus;
 import com.evolveum.midpoint.schema.util.FocusTypeUtil;
diff --git a/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyAuditService.java b/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyAuditService.java
index d5fadaf79f5..6f97a46980f 100644
--- a/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyAuditService.java
+++ b/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyAuditService.java
@@ -29,7 +29,6 @@
 import com.evolveum.midpoint.audit.api.AuditEventRecord;
 import com.evolveum.midpoint.audit.api.AuditEventStage;
 import com.evolveum.midpoint.audit.api.AuditService;
-import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.prism.PrismPropertyValue;
 import com.evolveum.midpoint.prism.PrismReferenceValue;
 import com.evolveum.midpoint.prism.delta.ChangeType;
diff --git a/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java b/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java
index 1ac57296898..6805f6f87a5 100644
--- a/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java
+++ b/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java
@@ -24,11 +24,7 @@
 import com.evolveum.midpoint.prism.match.MatchingRule;
 import com.evolveum.midpoint.prism.path.ItemPath;
 import com.evolveum.midpoint.prism.polystring.PolyString;
-import com.evolveum.midpoint.prism.query.AndFilter;
-import com.evolveum.midpoint.prism.query.EqualFilter;
-import com.evolveum.midpoint.prism.query.ObjectFilter;
 import com.evolveum.midpoint.prism.query.ObjectQuery;
-import com.evolveum.midpoint.prism.query.RefFilter;
 import com.evolveum.midpoint.prism.query.builder.QueryBuilder;
 import com.evolveum.midpoint.prism.schema.PrismSchema;
 import com.evolveum.midpoint.prism.schema.PrismSchemaImpl;