diff --git a/src/main/java/org/olat/core/gui/control/generic/portal/PortletToolSorting.java b/src/main/java/org/olat/core/gui/control/generic/portal/PortletToolSorting.java
index 80ad794d2cc5f30d672e55d6edc841e7cf6015ef..bc32b2e0a22a9a29d355ec85137f077226d768e3 100644
--- a/src/main/java/org/olat/core/gui/control/generic/portal/PortletToolSorting.java
+++ b/src/main/java/org/olat/core/gui/control/generic/portal/PortletToolSorting.java
@@ -26,9 +26,6 @@
 
 package org.olat.core.gui.control.generic.portal;
 
-import org.olat.core.gui.control.generic.portal.SortingCriteria;
-
-
 /**
  * Initial Date:  21.11.2007 <br>
  * @author Lavinia Dumitrescu
diff --git a/src/main/java/org/olat/modules/coach/ui/GroupsTableDataModel.java b/src/main/java/org/olat/modules/coach/ui/GroupsTableDataModel.java
index 9856d658e602c56d75a839f31f07fa1ac9c4876b..62ada14c7d793fa635fcc4fe6ece11d32ca2e500 100644
--- a/src/main/java/org/olat/modules/coach/ui/GroupsTableDataModel.java
+++ b/src/main/java/org/olat/modules/coach/ui/GroupsTableDataModel.java
@@ -24,8 +24,6 @@ import java.util.List;
 
 import org.olat.core.gui.components.table.TableDataModel;
 import org.olat.modules.coach.model.GroupStatEntry;
-import org.olat.modules.coach.ui.ProgressValue;
-
 import org.olat.modules.coach.ui.LightedValue.Light;
 
 /**
diff --git a/src/main/java/org/olat/modules/coach/ui/ProgressRenderer.java b/src/main/java/org/olat/modules/coach/ui/ProgressRenderer.java
index 5937dd758add2515eeebbc9aebff6bfd5535eed6..70fb5eb53a3be3680645aeb185baf63c58d4c072 100644
--- a/src/main/java/org/olat/modules/coach/ui/ProgressRenderer.java
+++ b/src/main/java/org/olat/modules/coach/ui/ProgressRenderer.java
@@ -25,7 +25,6 @@ import org.olat.core.gui.components.table.CustomCssCellRenderer;
 import org.olat.core.gui.render.Renderer;
 import org.olat.core.gui.render.StringOutput;
 import org.olat.core.gui.translator.Translator;
-import org.olat.modules.coach.ui.ProgressValue;
 
 /**
  * 
diff --git a/src/main/java/org/olat/repository/ui/catalog/CatalogSiteMainController.java b/src/main/java/org/olat/repository/ui/catalog/CatalogSiteMainController.java
index abfc1cd5d108feed9e926527ef64fc900a695574..f04bcb1ff037d3723086888c27a62165c40743a1 100644
--- a/src/main/java/org/olat/repository/ui/catalog/CatalogSiteMainController.java
+++ b/src/main/java/org/olat/repository/ui/catalog/CatalogSiteMainController.java
@@ -36,7 +36,6 @@ import org.olat.core.id.context.StateEntry;
 import org.olat.core.util.Util;
 import org.olat.repository.CatalogEntry;
 import org.olat.repository.manager.CatalogManager;
-import org.olat.repository.ui.catalog.CatalogNodeController;
 
 /**
  * 
diff --git a/src/test/java/org/olat/core/commons/services/doceditor/wopi/manager/WopiXStreamTest.java b/src/test/java/org/olat/core/commons/services/doceditor/wopi/manager/WopiXStreamTest.java
index 039469ab03a1cd908077e938a2eb8abeedf23e86..852d5883e1344310b4fe543a3494b647b8744dac 100644
--- a/src/test/java/org/olat/core/commons/services/doceditor/wopi/manager/WopiXStreamTest.java
+++ b/src/test/java/org/olat/core/commons/services/doceditor/wopi/manager/WopiXStreamTest.java
@@ -31,7 +31,6 @@ import org.olat.core.commons.services.doceditor.wopi.App;
 import org.olat.core.commons.services.doceditor.wopi.Discovery;
 import org.olat.core.commons.services.doceditor.wopi.NetZone;
 import org.olat.core.commons.services.doceditor.wopi.ProofKey;
-import org.olat.core.commons.services.doceditor.wopi.manager.WopiXStream;
 
 /**
  * 
diff --git a/src/test/java/org/olat/core/commons/services/taskexecutor/manager/PersistentTaskDAOTest.java b/src/test/java/org/olat/core/commons/services/taskexecutor/manager/PersistentTaskDAOTest.java
index 4d84d4847c61f8a97ec67da88e829d81491696a3..e26a5043722851000c7a0e9fb2103d6f11766bf6 100644
--- a/src/test/java/org/olat/core/commons/services/taskexecutor/manager/PersistentTaskDAOTest.java
+++ b/src/test/java/org/olat/core/commons/services/taskexecutor/manager/PersistentTaskDAOTest.java
@@ -26,15 +26,14 @@ import java.util.UUID;
 
 import javax.persistence.EntityNotFoundException;
 
+import org.apache.logging.log4j.Logger;
 import org.junit.Assert;
 import org.junit.Test;
 import org.olat.core.commons.persistence.DB;
 import org.olat.core.commons.services.taskexecutor.Task;
 import org.olat.core.commons.services.taskexecutor.TaskStatus;
-import org.olat.core.commons.services.taskexecutor.manager.PersistentTaskDAO;
 import org.olat.core.commons.services.taskexecutor.model.PersistentTask;
 import org.olat.core.id.Identity;
-import org.apache.logging.log4j.Logger;
 import org.olat.core.logging.Tracing;
 import org.olat.core.util.WebappHelper;
 import org.olat.core.util.xml.XStreamHelper;
diff --git a/src/test/java/org/olat/group/manager/BusinessGroupImportExportXStreamTest.java b/src/test/java/org/olat/group/manager/BusinessGroupImportExportXStreamTest.java
index 2c847b131e464b72dcb43338f759357751c9f573..32027c1092e2358bae6e72ba8c9275586bb65732 100644
--- a/src/test/java/org/olat/group/manager/BusinessGroupImportExportXStreamTest.java
+++ b/src/test/java/org/olat/group/manager/BusinessGroupImportExportXStreamTest.java
@@ -30,7 +30,6 @@ import static org.junit.Assert.assertNotNull;
 import java.io.InputStream;
 
 import org.junit.Test;
-import org.olat.group.manager.GroupXStream;
 
 /**
  * 
diff --git a/src/test/java/org/olat/login/validation/PasswordSyntaxValidatorTest.java b/src/test/java/org/olat/login/validation/PasswordSyntaxValidatorTest.java
index b1805fcdc802e3df22c8a9d6b8cebdd10c850b07..00f9dc11bd98aef96d62e205ebb99452ed8b2b8b 100644
--- a/src/test/java/org/olat/login/validation/PasswordSyntaxValidatorTest.java
+++ b/src/test/java/org/olat/login/validation/PasswordSyntaxValidatorTest.java
@@ -28,10 +28,6 @@ import java.util.List;
 import org.assertj.core.api.SoftAssertions;
 import org.junit.Test;
 import org.olat.core.id.Identity;
-import org.olat.login.validation.SyntaxValidator;
-import org.olat.login.validation.ValidationDescription;
-import org.olat.login.validation.ValidationResult;
-import org.olat.login.validation.ValidationRule;
 
 /**
  * 
diff --git a/src/test/java/org/olat/login/validation/PasswordValidationRuleFactoryTest.java b/src/test/java/org/olat/login/validation/PasswordValidationRuleFactoryTest.java
index 36f380c27e97c0bfa666273b5196d6b08d1fd844..0d84937e49e7b0831109c40abb539c9ec1af14ee 100644
--- a/src/test/java/org/olat/login/validation/PasswordValidationRuleFactoryTest.java
+++ b/src/test/java/org/olat/login/validation/PasswordValidationRuleFactoryTest.java
@@ -28,8 +28,6 @@ import org.mockito.Mock;
 import org.olat.core.gui.translator.Translator;
 import org.olat.core.id.Identity;
 import org.olat.core.id.User;
-import org.olat.login.validation.PasswordValidationRuleFactory;
-import org.olat.login.validation.ValidationRule;
 
 /**
  * 
diff --git a/src/test/java/org/olat/modules/video/spi/youtube/YoutubeProviderTest.java b/src/test/java/org/olat/modules/video/spi/youtube/YoutubeProviderTest.java
index a3802430cd1eed003cf598c913dd4f96e5aee1c1..324dbd84af6acc5b97cfbf3cb60523da994fddef 100644
--- a/src/test/java/org/olat/modules/video/spi/youtube/YoutubeProviderTest.java
+++ b/src/test/java/org/olat/modules/video/spi/youtube/YoutubeProviderTest.java
@@ -25,7 +25,6 @@ import java.nio.charset.StandardCharsets;
 import org.apache.commons.io.IOUtils;
 import org.junit.Assert;
 import org.junit.Test;
-import org.olat.modules.video.spi.youtube.YoutubeProvider;
 import org.olat.modules.video.spi.youtube.model.YoutubeMetadata;
 
 /**