diff --git a/datastore/src/test/java/net/jami/datastore/dao/ContactDaoTest.java b/datastore/src/test/java/net/jami/datastore/dao/ContactDaoTest.java
index c3709baac20bcbe5546515bf79428398dbb31f3b..90c32db00aad29daf09710e1a5a02568bee287e1 100644
--- a/datastore/src/test/java/net/jami/datastore/dao/ContactDaoTest.java
+++ b/datastore/src/test/java/net/jami/datastore/dao/ContactDaoTest.java
@@ -1,7 +1,5 @@
 package net.jami.datastore.dao;
 
-import static org.junit.jupiter.api.Assertions.*;
-
 class ContactDaoTest {
 
 }
\ No newline at end of file
diff --git a/datastore/src/test/java/net/jami/datastore/dao/SystemDaoTest.java b/datastore/src/test/java/net/jami/datastore/dao/SystemDaoTest.java
index f5e04fe96f7f538e399dc8481220abd633a71824..47fc837181157b1eca4765319027f7f1e2c0e83a 100644
--- a/datastore/src/test/java/net/jami/datastore/dao/SystemDaoTest.java
+++ b/datastore/src/test/java/net/jami/datastore/dao/SystemDaoTest.java
@@ -1,7 +1,5 @@
 package net.jami.datastore.dao;
 
-import static org.junit.jupiter.api.Assertions.*;
-
 class SystemDaoTest {
 
 }
\ No newline at end of file
diff --git a/jams-ca/src/main/java/net/jami/jams/ca/workers/csr/builders/UserBuilder.java b/jams-ca/src/main/java/net/jami/jams/ca/workers/csr/builders/UserBuilder.java
index 2ec6e9c81d1e47f5a3d1da6db3750e5a8385fb62..c904d28355bac189899b952c6b0ff0e57626f556 100644
--- a/jams-ca/src/main/java/net/jami/jams/ca/workers/csr/builders/UserBuilder.java
+++ b/jams-ca/src/main/java/net/jami/jams/ca/workers/csr/builders/UserBuilder.java
@@ -21,7 +21,6 @@ public class UserBuilder {
 
     public static User generateUser(User user) {
         try {
-
             KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA");
             keyPairGenerator.initialize(4096);
             KeyPair keyPair = keyPairGenerator.generateKeyPair();
diff --git a/jams-server/src/main/java/net/jami/jams/server/core/workflows/RegisterDeviceFlow.java b/jams-server/src/main/java/net/jami/jams/server/core/workflows/RegisterDeviceFlow.java
index 7feb935fd998570490f125e528231af25b0c2f84..0b5640e9213ebf60055e79605a895b8bbd685f7f 100644
--- a/jams-server/src/main/java/net/jami/jams/server/core/workflows/RegisterDeviceFlow.java
+++ b/jams-server/src/main/java/net/jami/jams/server/core/workflows/RegisterDeviceFlow.java
@@ -10,6 +10,7 @@ import net.jami.jams.common.objects.responses.DeviceRegistrationResponse;
 import net.jami.jams.common.objects.user.User;
 import net.jami.jams.common.objects.user.UserProfile;
 import net.jami.jams.dht.DeviceReceiptGenerator;
+
 import java.security.cert.X509Certificate;
 
 import static net.jami.jams.server.Server.*;
diff --git a/jams-server/src/main/java/net/jami/jams/server/servlets/api/auth/device/DeviceServlet.java b/jams-server/src/main/java/net/jami/jams/server/servlets/api/auth/device/DeviceServlet.java
index ca58d73056e2208caecb33e1146c4ed92d759b24..91dd970c7bacfbd888636313260f21a695d40781 100644
--- a/jams-server/src/main/java/net/jami/jams/server/servlets/api/auth/device/DeviceServlet.java
+++ b/jams-server/src/main/java/net/jami/jams/server/servlets/api/auth/device/DeviceServlet.java
@@ -9,7 +9,6 @@ import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import net.jami.jams.common.dao.StatementElement;
 import net.jami.jams.common.dao.StatementList;
-import net.jami.jams.common.objects.devices.Device;
 import net.jami.jams.common.objects.requests.DeviceRegistrationRequest;
 import net.jami.jams.common.objects.responses.DeviceRegistrationResponse;
 import net.jami.jams.server.core.workflows.RegisterDeviceFlow;
diff --git a/jams-server/src/main/java/net/jami/jams/server/servlets/api/jaminameserver/AddressServlet.java b/jams-server/src/main/java/net/jami/jams/server/servlets/api/jaminameserver/AddressServlet.java
index 913a13ef7c9e1ef1138aa173a5adb85d25b5232e..bb63710e36d0a5b7bf1b734cc2d0a08a7482a1dc 100644
--- a/jams-server/src/main/java/net/jami/jams/server/servlets/api/jaminameserver/AddressServlet.java
+++ b/jams-server/src/main/java/net/jami/jams/server/servlets/api/jaminameserver/AddressServlet.java
@@ -8,7 +8,6 @@ import jakarta.servlet.http.HttpServlet;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import net.jami.jams.common.jami.AddrLookupResponse;
-import net.jami.jams.common.jami.NameLookupResponse;
 
 import java.io.IOException;
 
diff --git a/jams-server/src/main/java/net/jami/jams/server/servlets/x509/CRLServlet.java b/jams-server/src/main/java/net/jami/jams/server/servlets/x509/CRLServlet.java
index 912e41534b53148416177c2c6c3a672b8da62ed8..ec5bdca7a8a817baddce367e7d1659629e5449df 100644
--- a/jams-server/src/main/java/net/jami/jams/server/servlets/x509/CRLServlet.java
+++ b/jams-server/src/main/java/net/jami/jams/server/servlets/x509/CRLServlet.java
@@ -7,7 +7,6 @@ import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 
 import java.io.IOException;
-import java.util.Base64;
 
 import static net.jami.jams.server.Server.certificateAuthority;