diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/ActionFields.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/ActionFields.java
index e08f63cb6..a5e43b506 100644
--- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/ActionFields.java
+++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/ActionFields.java
@@ -9,7 +9,6 @@
  */
 package org.eclipse.hawkbit.repository;
 
-import java.util.Collections;
 import java.util.List;
 
 import lombok.Getter;
diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/DistributionSetFields.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/DistributionSetFields.java
index 7a993ed6f..1ca1a7925 100644
--- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/DistributionSetFields.java
+++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/DistributionSetFields.java
@@ -9,11 +9,7 @@
  */
 package org.eclipse.hawkbit.repository;
 
-import java.util.AbstractMap.SimpleImmutableEntry;
-import java.util.Collections;
 import java.util.List;
-import java.util.Map.Entry;
-import java.util.Optional;
 
 import lombok.Getter;
 
diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/DistributionSetTagFields.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/DistributionSetTagFields.java
index 844e255b7..d7cfbc751 100644
--- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/DistributionSetTagFields.java
+++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/DistributionSetTagFields.java
@@ -9,7 +9,6 @@
  */
 package org.eclipse.hawkbit.repository;
 
-import java.util.Collections;
 import java.util.List;
 
 import lombok.Getter;
diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/RolloutFields.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/RolloutFields.java
index 98da41470..55d60d10e 100644
--- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/RolloutFields.java
+++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/RolloutFields.java
@@ -9,7 +9,6 @@
  */
 package org.eclipse.hawkbit.repository;
 
-import java.util.Collections;
 import java.util.List;
 
 import lombok.Getter;
diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/RsqlQueryField.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/RsqlQueryField.java
index ae5007dcb..b36736539 100644
--- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/RsqlQueryField.java
+++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/RsqlQueryField.java
@@ -12,8 +12,6 @@ package org.eclipse.hawkbit.repository;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Optional;
 
 import jakarta.validation.constraints.NotNull;
 
diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetFields.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetFields.java
index 709646d21..2ffbe6368 100644
--- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetFields.java
+++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetFields.java
@@ -9,10 +9,7 @@
  */
 package org.eclipse.hawkbit.repository;
 
-import java.util.Collections;
 import java.util.List;
-import java.util.Map.Entry;
-import java.util.Optional;
 
 import lombok.Getter;