diff --git a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/json/jackson2/FlowableJackson2JsonNode.java b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/json/jackson2/FlowableJackson2JsonNode.java
index 5684efa0632..67e499f1765 100644
--- a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/json/jackson2/FlowableJackson2JsonNode.java
+++ b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/json/jackson2/FlowableJackson2JsonNode.java
@@ -13,7 +13,6 @@
 package org.flowable.common.engine.impl.json.jackson2;
 
 import java.util.Collection;
-import java.util.List;
 import java.util.Spliterators;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
diff --git a/modules/flowable-engine-common/src/test/java/org/flowable/common/engine/impl/de/odysseus/el/misc/TypeConverterImplTest.java b/modules/flowable-engine-common/src/test/java/org/flowable/common/engine/impl/de/odysseus/el/misc/TypeConverterImplTest.java
index 2f860b2da1c..37c77a39b8a 100644
--- a/modules/flowable-engine-common/src/test/java/org/flowable/common/engine/impl/de/odysseus/el/misc/TypeConverterImplTest.java
+++ b/modules/flowable-engine-common/src/test/java/org/flowable/common/engine/impl/de/odysseus/el/misc/TypeConverterImplTest.java
@@ -18,7 +18,9 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import java.awt.*;
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.Rectangle;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyEditor;
 import java.beans.PropertyEditorManager;
diff --git a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/bpmn/deployer/EventSubscriptionManager.java b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/bpmn/deployer/EventSubscriptionManager.java
index bd3403cfd26..06c447af540 100644
--- a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/bpmn/deployer/EventSubscriptionManager.java
+++ b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/bpmn/deployer/EventSubscriptionManager.java
@@ -45,7 +45,6 @@
 import org.flowable.eventsubscription.service.impl.persistence.entity.EventSubscriptionEntity;
 import org.flowable.eventsubscription.service.impl.persistence.entity.MessageEventSubscriptionEntity;
 import org.flowable.eventsubscription.service.impl.persistence.entity.SignalEventSubscriptionEntity;
-import org.flowable.common.engine.impl.el.DefinitionVariableContainer;
 
 /**
  * Manages event subscriptions for newly-deployed process definitions and their previous versions.
diff --git a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/repository/DeploymentProcessDefinitionDeletionManagerImpl.java b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/repository/DeploymentProcessDefinitionDeletionManagerImpl.java
index 28eda80328a..ea3a7c975de 100644
--- a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/repository/DeploymentProcessDefinitionDeletionManagerImpl.java
+++ b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/repository/DeploymentProcessDefinitionDeletionManagerImpl.java
@@ -26,7 +26,6 @@
 import org.flowable.common.engine.api.delegate.event.FlowableEngineEventType;
 import org.flowable.common.engine.api.delegate.event.FlowableEventDispatcher;
 import org.flowable.common.engine.api.scope.ScopeTypes;
-import org.flowable.common.engine.impl.el.DefinitionVariableContainer;
 import org.flowable.common.engine.impl.interceptor.CommandContext;
 import org.flowable.common.engine.impl.util.CollectionUtil;
 import org.flowable.engine.ProcessEngineConfiguration;
@@ -37,7 +36,6 @@
 import org.flowable.engine.impl.event.EventDefinitionExpressionUtil;
 import org.flowable.engine.impl.jobexecutor.TimerEventHandler;
 import org.flowable.engine.impl.jobexecutor.TimerStartEventJobHandler;
-import org.flowable.engine.impl.persistence.entity.ExecutionEntity;
 import org.flowable.engine.impl.persistence.entity.ProcessDefinitionEntity;
 import org.flowable.engine.impl.persistence.entity.ProcessDefinitionEntityManager;
 import org.flowable.engine.impl.util.CorrelationUtil;
diff --git a/modules/flowable-engine/src/main/java/org/flowable/engine/migration/ActivityMigrationMappingOptions.java b/modules/flowable-engine/src/main/java/org/flowable/engine/migration/ActivityMigrationMappingOptions.java
index 048024a270a..65249c8203c 100644
--- a/modules/flowable-engine/src/main/java/org/flowable/engine/migration/ActivityMigrationMappingOptions.java
+++ b/modules/flowable-engine/src/main/java/org/flowable/engine/migration/ActivityMigrationMappingOptions.java
@@ -12,7 +12,6 @@
  */
 package org.flowable.engine.migration;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
diff --git a/modules/flowable-engine/src/test/java/org/flowable/engine/test/bpmn/multiinstance/MultiInstanceVariableAggregationTest.java b/modules/flowable-engine/src/test/java/org/flowable/engine/test/bpmn/multiinstance/MultiInstanceVariableAggregationTest.java
index adf0bbc7fed..f3798a594ea 100644
--- a/modules/flowable-engine/src/test/java/org/flowable/engine/test/bpmn/multiinstance/MultiInstanceVariableAggregationTest.java
+++ b/modules/flowable-engine/src/test/java/org/flowable/engine/test/bpmn/multiinstance/MultiInstanceVariableAggregationTest.java
@@ -21,7 +21,6 @@
 import java.time.Month;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
diff --git a/modules/flowable-engine/src/test/java/org/flowable/engine/test/el/ExpressionManagerJackson2Test.java b/modules/flowable-engine/src/test/java/org/flowable/engine/test/el/ExpressionManagerJackson2Test.java
index ba9c14fbd75..ac907e79b2e 100644
--- a/modules/flowable-engine/src/test/java/org/flowable/engine/test/el/ExpressionManagerJackson2Test.java
+++ b/modules/flowable-engine/src/test/java/org/flowable/engine/test/el/ExpressionManagerJackson2Test.java
@@ -21,7 +21,6 @@
 
 import org.flowable.common.engine.api.delegate.Expression;
 import org.flowable.common.engine.impl.json.jackson2.Jackson2VariableJsonMapper;
-import org.flowable.common.engine.impl.tenant.CurrentTenant;
 import org.flowable.engine.ProcessEngineConfiguration;
 import org.flowable.engine.impl.cfg.ProcessEngineConfigurationImpl;
 import org.flowable.engine.impl.persistence.entity.ExecutionEntity;