diff --git a/infra/util/src/main/java/com/evolveum/midpoint/util/exception/PolicyViolationException.java b/infra/util/src/main/java/com/evolveum/midpoint/util/exception/PolicyViolationException.java
index b9156f026c1..ad2a5c4c83f 100644
--- a/infra/util/src/main/java/com/evolveum/midpoint/util/exception/PolicyViolationException.java
+++ b/infra/util/src/main/java/com/evolveum/midpoint/util/exception/PolicyViolationException.java
@@ -17,8 +17,6 @@
 
 import com.evolveum.midpoint.util.LocalizableMessage;
 
-import java.util.List;
-
 /**
  * @author semancik
  *
diff --git a/repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/ItemSecurityConstraintsImpl.java b/repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/ItemSecurityConstraintsImpl.java
index 637c7840ef4..f8ad632b4b3 100644
--- a/repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/ItemSecurityConstraintsImpl.java
+++ b/repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/ItemSecurityConstraintsImpl.java
@@ -18,7 +18,6 @@
 import com.evolveum.midpoint.prism.path.ItemPath;
 import com.evolveum.midpoint.security.api.Authorization;
 import com.evolveum.midpoint.security.enforcer.api.ItemSecurityConstraints;
-import com.evolveum.midpoint.util.DebugDumpable;
 import com.evolveum.midpoint.util.DebugUtil;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.AuthorizationDecisionType;
 
diff --git a/repo/system-init/src/main/java/com/evolveum/midpoint/init/ConfigurablePrismContextFactory.java b/repo/system-init/src/main/java/com/evolveum/midpoint/init/ConfigurablePrismContextFactory.java
index caa21bd3493..373cf611b6d 100644
--- a/repo/system-init/src/main/java/com/evolveum/midpoint/init/ConfigurablePrismContextFactory.java
+++ b/repo/system-init/src/main/java/com/evolveum/midpoint/init/ConfigurablePrismContextFactory.java
@@ -17,7 +17,6 @@
 package com.evolveum.midpoint.init;
 
 import com.evolveum.midpoint.common.configuration.api.MidpointConfiguration;
-import com.evolveum.midpoint.prism.schema.SchemaRegistry;
 import com.evolveum.midpoint.prism.schema.SchemaRegistryImpl;
 import com.evolveum.midpoint.schema.MidPointPrismContextFactory;
 import com.evolveum.midpoint.util.exception.SchemaException;
diff --git a/repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskManagerUtil.java b/repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskManagerUtil.java
index cc6b97b2adb..2eb7002fcf2 100644
--- a/repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskManagerUtil.java
+++ b/repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskManagerUtil.java
@@ -19,7 +19,6 @@
 import com.evolveum.midpoint.util.MiscUtil;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.NodeType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.TaskGroupExecutionLimitationType;
-import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.HashMap;
diff --git a/repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/Initializer.java b/repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/Initializer.java
index 28f5b977328..00ca374d65f 100644
--- a/repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/Initializer.java
+++ b/repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/Initializer.java
@@ -17,7 +17,6 @@
 package com.evolveum.midpoint.task.quartzimpl;
 
 import com.evolveum.midpoint.common.configuration.api.MidpointConfiguration;
-import com.evolveum.midpoint.repo.api.RepositoryServiceFactoryException;
 import com.evolveum.midpoint.repo.sql.SqlRepositoryConfiguration;
 import com.evolveum.midpoint.repo.sql.SqlRepositoryFactory;
 import com.evolveum.midpoint.schema.result.OperationResult;
@@ -27,7 +26,6 @@
 import com.evolveum.midpoint.task.quartzimpl.handlers.NoOpTaskHandler;
 import com.evolveum.midpoint.task.quartzimpl.handlers.WaitForSubtasksByPollingTaskHandler;
 import com.evolveum.midpoint.task.quartzimpl.handlers.WaitForTasksTaskHandler;
-import com.evolveum.midpoint.util.logging.LoggingUtils;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.NodeErrorStatusType;