diff --git a/code/common/service-discovery/src/main/java/nu/marginalia/service/client/GrpcMultiNodeChannelPool.java b/code/common/service-discovery/src/main/java/nu/marginalia/service/client/GrpcMultiNodeChannelPool.java
index 149c9943..c725fa0b 100644
--- a/code/common/service-discovery/src/main/java/nu/marginalia/service/client/GrpcMultiNodeChannelPool.java
+++ b/code/common/service-discovery/src/main/java/nu/marginalia/service/client/GrpcMultiNodeChannelPool.java
@@ -11,13 +11,10 @@ import nu.marginalia.service.discovery.property.ServicePartition;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.*;
 import java.util.function.BiFunction;
-import java.util.function.Consumer;
 import java.util.function.Function;
-import java.util.stream.Stream;
 
 /** A pool of gRPC channels for a service, with a separate channel for each node.
  * <p></p>
diff --git a/code/common/service/src/main/java/nu/marginalia/service/module/DatabaseModule.java b/code/common/service/src/main/java/nu/marginalia/service/module/DatabaseModule.java
index a196872f..15a70e57 100644
--- a/code/common/service/src/main/java/nu/marginalia/service/module/DatabaseModule.java
+++ b/code/common/service/src/main/java/nu/marginalia/service/module/DatabaseModule.java
@@ -7,7 +7,6 @@ import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
 import lombok.SneakyThrows;
 import nu.marginalia.WmsaHome;
-import nu.marginalia.service.ServiceHomeNotConfiguredException;
 import org.flywaydb.core.Flyway;
 import org.mariadb.jdbc.Driver;
 import org.slf4j.Logger;
@@ -18,7 +17,6 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.time.Duration;
-import java.util.Optional;
 import java.util.Properties;
 
 public class DatabaseModule extends AbstractModule {
diff --git a/code/common/service/src/main/java/nu/marginalia/service/module/ServiceConfiguration.java b/code/common/service/src/main/java/nu/marginalia/service/module/ServiceConfiguration.java
index cf152bf0..e64c88a8 100644
--- a/code/common/service/src/main/java/nu/marginalia/service/module/ServiceConfiguration.java
+++ b/code/common/service/src/main/java/nu/marginalia/service/module/ServiceConfiguration.java
@@ -1,6 +1,5 @@
 package nu.marginalia.service.module;
 
-import nu.marginalia.service.discovery.property.ServicePartition;
 import nu.marginalia.service.id.ServiceId;
 
 import java.util.UUID;
diff --git a/code/functions/domain-info/api/src/main/java/nu/marginalia/api/domains/DomainInfoClient.java b/code/functions/domain-info/api/src/main/java/nu/marginalia/api/domains/DomainInfoClient.java
index ee305994..80ca97fb 100644
--- a/code/functions/domain-info/api/src/main/java/nu/marginalia/api/domains/DomainInfoClient.java
+++ b/code/functions/domain-info/api/src/main/java/nu/marginalia/api/domains/DomainInfoClient.java
@@ -2,7 +2,6 @@ package nu.marginalia.api.domains;
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
-import nu.marginalia.api.domains.model.SimilarDomain;
 import nu.marginalia.service.client.GrpcChannelPoolFactory;
 import nu.marginalia.service.client.GrpcSingleNodeChannelPool;
 import nu.marginalia.service.discovery.property.ServiceKey;
diff --git a/code/functions/domain-info/src/main/java/nu/marginalia/functions/domains/DomainInfoGrpcService.java b/code/functions/domain-info/src/main/java/nu/marginalia/functions/domains/DomainInfoGrpcService.java
index 9bf8a1c2..8af30e56 100644
--- a/code/functions/domain-info/src/main/java/nu/marginalia/functions/domains/DomainInfoGrpcService.java
+++ b/code/functions/domain-info/src/main/java/nu/marginalia/functions/domains/DomainInfoGrpcService.java
@@ -2,7 +2,6 @@ package nu.marginalia.functions.domains;
 
 import com.google.inject.Inject;
 import io.grpc.stub.StreamObserver;
-import nu.marginalia.api.domains.DomainInfoAPIGrpc;
 import nu.marginalia.api.domains.*;
 
 public class DomainInfoGrpcService extends DomainInfoAPIGrpc.DomainInfoAPIImplBase {
diff --git a/code/functions/domain-links/partition/src/main/java/nu/marginalia/functions/domainlinks/PartitionDomainLinksService.java b/code/functions/domain-links/partition/src/main/java/nu/marginalia/functions/domainlinks/PartitionDomainLinksService.java
index 323ec51d..bb89fc6b 100644
--- a/code/functions/domain-links/partition/src/main/java/nu/marginalia/functions/domainlinks/PartitionDomainLinksService.java
+++ b/code/functions/domain-links/partition/src/main/java/nu/marginalia/functions/domainlinks/PartitionDomainLinksService.java
@@ -2,7 +2,6 @@ package nu.marginalia.functions.domainlinks;
 
 import com.google.inject.Inject;
 import io.grpc.stub.StreamObserver;
-import nu.marginalia.api.domainlink.Empty;
 import nu.marginalia.api.domainlink.*;
 import nu.marginalia.linkdb.dlinks.DomainLinkDb;
 
diff --git a/code/functions/math/api/src/main/java/nu/marginalia/api/math/MathClient.java b/code/functions/math/api/src/main/java/nu/marginalia/api/math/MathClient.java
index c851aee9..27867b6c 100644
--- a/code/functions/math/api/src/main/java/nu/marginalia/api/math/MathClient.java
+++ b/code/functions/math/api/src/main/java/nu/marginalia/api/math/MathClient.java
@@ -6,12 +6,10 @@ import nu.marginalia.service.client.GrpcChannelPoolFactory;
 import nu.marginalia.service.client.GrpcSingleNodeChannelPool;
 import nu.marginalia.service.discovery.property.ServiceKey;
 import nu.marginalia.service.discovery.property.ServicePartition;
-import nu.marginalia.service.id.ServiceId;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.time.Duration;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
diff --git a/code/index/src/test/java/nu/marginalia/ranking/domains/RankingAlgorithmsContainerTest.java b/code/index/src/test/java/nu/marginalia/ranking/domains/RankingAlgorithmsContainerTest.java
index e27d881c..c25b818a 100644
--- a/code/index/src/test/java/nu/marginalia/ranking/domains/RankingAlgorithmsContainerTest.java
+++ b/code/index/src/test/java/nu/marginalia/ranking/domains/RankingAlgorithmsContainerTest.java
@@ -20,7 +20,6 @@ import org.testcontainers.junit.jupiter.Testcontainers;
 import java.sql.SQLException;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
 import static org.junit.jupiter.api.parallel.ExecutionMode.SAME_THREAD;
 import static org.mockito.Mockito.when;
 
diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/command/commands/SearchCommand.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/command/commands/SearchCommand.java
index 323d744e..ea054a7b 100644
--- a/code/services-application/search-service/src/main/java/nu/marginalia/search/command/commands/SearchCommand.java
+++ b/code/services-application/search-service/src/main/java/nu/marginalia/search/command/commands/SearchCommand.java
@@ -1,7 +1,6 @@
 package nu.marginalia.search.command.commands;
 
 import com.google.inject.Inject;
-import nu.marginalia.db.DomainBlacklist;
 import nu.marginalia.search.SearchOperator;
 import nu.marginalia.search.command.SearchCommandInterface;
 import nu.marginalia.search.command.SearchParameters;
diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/sys/svc/ControlDomainRankingSetsService.java b/code/services-core/control-service/src/main/java/nu/marginalia/control/sys/svc/ControlDomainRankingSetsService.java
index ca2c3bc7..e2adf14b 100644
--- a/code/services-core/control-service/src/main/java/nu/marginalia/control/sys/svc/ControlDomainRankingSetsService.java
+++ b/code/services-core/control-service/src/main/java/nu/marginalia/control/sys/svc/ControlDomainRankingSetsService.java
@@ -1,7 +1,6 @@
 package nu.marginalia.control.sys.svc;
 
 import com.google.inject.Inject;
-import com.zaxxer.hikari.HikariDataSource;
 import nu.marginalia.control.ControlRendererFactory;
 import nu.marginalia.control.ControlValidationError;
 import nu.marginalia.control.Redirects;
diff --git a/code/services-core/query-service/src/main/java/nu/marginalia/query/QueryService.java b/code/services-core/query-service/src/main/java/nu/marginalia/query/QueryService.java
index 9ccb3f95..b8a4c6c5 100644
--- a/code/services-core/query-service/src/main/java/nu/marginalia/query/QueryService.java
+++ b/code/services-core/query-service/src/main/java/nu/marginalia/query/QueryService.java
@@ -1,7 +1,6 @@
 package nu.marginalia.query;
 
 import com.google.inject.Inject;
-import io.prometheus.client.Histogram;
 import lombok.SneakyThrows;
 import nu.marginalia.functions.domainlinks.AggregateDomainLinksService;
 import nu.marginalia.functions.searchquery.QueryGRPCService;