diff --git a/src/main/java/io/github/randomcodespace/iq/analyzer/StructuredParser.java b/src/main/java/io/github/randomcodespace/iq/analyzer/StructuredParser.java
index 5448c7ad..595b884c 100644
--- a/src/main/java/io/github/randomcodespace/iq/analyzer/StructuredParser.java
+++ b/src/main/java/io/github/randomcodespace/iq/analyzer/StructuredParser.java
@@ -63,7 +63,6 @@ public Object parse(String language, String content, String filePath) {
     // Individual parsers
     // ------------------------------------------------------------------
 
-    @SuppressWarnings("unchecked")
     private Object parseYaml(String content) {
         var yaml = new Yaml(new org.yaml.snakeyaml.constructor.SafeConstructor(new org.yaml.snakeyaml.LoaderOptions()));
         var docs = new java.util.ArrayList<>();
@@ -82,7 +81,6 @@ private Object parseYaml(String content) {
         return result;
     }
 
-    @SuppressWarnings("unchecked")
     private Object parseJson(String content) throws Exception {
         Object data = objectMapper.readValue(content, Object.class);
         Map<String, Object> result = new LinkedHashMap<>();
diff --git a/src/main/java/io/github/randomcodespace/iq/analyzer/linker/EntityLinker.java b/src/main/java/io/github/randomcodespace/iq/analyzer/linker/EntityLinker.java
index bd1826d9..c8f25d6b 100644
--- a/src/main/java/io/github/randomcodespace/iq/analyzer/linker/EntityLinker.java
+++ b/src/main/java/io/github/randomcodespace/iq/analyzer/linker/EntityLinker.java
@@ -9,7 +9,6 @@
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
diff --git a/src/main/java/io/github/randomcodespace/iq/analyzer/linker/ModuleContainmentLinker.java b/src/main/java/io/github/randomcodespace/iq/analyzer/linker/ModuleContainmentLinker.java
index f73e2319..739be535 100644
--- a/src/main/java/io/github/randomcodespace/iq/analyzer/linker/ModuleContainmentLinker.java
+++ b/src/main/java/io/github/randomcodespace/iq/analyzer/linker/ModuleContainmentLinker.java
@@ -9,7 +9,6 @@
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
diff --git a/src/main/java/io/github/randomcodespace/iq/cache/AnalysisCache.java b/src/main/java/io/github/randomcodespace/iq/cache/AnalysisCache.java
index 0d2374d2..e2e5c825 100644
--- a/src/main/java/io/github/randomcodespace/iq/cache/AnalysisCache.java
+++ b/src/main/java/io/github/randomcodespace/iq/cache/AnalysisCache.java
@@ -15,7 +15,6 @@
 import java.nio.file.Path;
 import java.sql.Connection;
 import java.sql.DriverManager;
-import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.time.Instant;
diff --git a/src/main/java/io/github/randomcodespace/iq/cli/BundleCommand.java b/src/main/java/io/github/randomcodespace/iq/cli/BundleCommand.java
index 47f52bd5..74a5fa9e 100644
--- a/src/main/java/io/github/randomcodespace/iq/cli/BundleCommand.java
+++ b/src/main/java/io/github/randomcodespace/iq/cli/BundleCommand.java
@@ -21,9 +21,7 @@
 import java.nio.file.Path;
 import java.text.NumberFormat;
 import java.time.Instant;
-import java.util.LinkedHashMap;
 import java.util.Locale;
-import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.Callable;
 import java.util.stream.Stream;
diff --git a/src/main/java/io/github/randomcodespace/iq/cli/PluginsCommand.java b/src/main/java/io/github/randomcodespace/iq/cli/PluginsCommand.java
index 57542283..b47a81ed 100644
--- a/src/main/java/io/github/randomcodespace/iq/cli/PluginsCommand.java
+++ b/src/main/java/io/github/randomcodespace/iq/cli/PluginsCommand.java
@@ -16,7 +16,6 @@
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.ArrayList;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
diff --git a/src/main/java/io/github/randomcodespace/iq/config/ProjectConfigLoader.java b/src/main/java/io/github/randomcodespace/iq/config/ProjectConfigLoader.java
index d271c583..33655f88 100644
--- a/src/main/java/io/github/randomcodespace/iq/config/ProjectConfigLoader.java
+++ b/src/main/java/io/github/randomcodespace/iq/config/ProjectConfigLoader.java
@@ -126,7 +126,6 @@ private record LegacyParse(CodeIqUnifiedConfig config, int translatedKeyCount) {
      * (which have no legacy flat equivalent) are still read via the unified
      * loader path and composed into the overlay.
      */
-    @SuppressWarnings("unchecked")
     private static LegacyParse readAndTranslateLegacy(Path oldFile) {
         Map<String, Object> raw;
         try {
@@ -196,7 +195,6 @@ private static int countLegacyKeys(Map<String, Object> raw) {
      * {@code null} so {@link io.github.randomcodespace.iq.config.unified.ConfigMerger}
      * correctly falls through to lower layers.
      */
-    @SuppressWarnings("unchecked")
     static CodeIqUnifiedConfig translateLegacyToUnified(Map<String, Object> raw) {
         // --- project layer ---
         String root = raw.containsKey("root_path") ? String.valueOf(raw.get("root_path")) : null;
diff --git a/src/main/java/io/github/randomcodespace/iq/detector/csharp/CSharpStructuresDetector.java b/src/main/java/io/github/randomcodespace/iq/detector/csharp/CSharpStructuresDetector.java
index d72cc7c1..99c0058e 100644
--- a/src/main/java/io/github/randomcodespace/iq/detector/csharp/CSharpStructuresDetector.java
+++ b/src/main/java/io/github/randomcodespace/iq/detector/csharp/CSharpStructuresDetector.java
@@ -1,7 +1,6 @@
 package io.github.randomcodespace.iq.detector.csharp;
 
 import io.github.randomcodespace.iq.detector.AbstractAntlrDetector;
-import io.github.randomcodespace.iq.grammar.AntlrParserFactory;
 import io.github.randomcodespace.iq.detector.DetectorContext;
 import io.github.randomcodespace.iq.detector.DetectorResult;
 import io.github.randomcodespace.iq.model.CodeEdge;
@@ -36,7 +35,6 @@ public class CSharpStructuresDetector extends AbstractAntlrDetector {
     private static final Pattern USING_RE = Pattern.compile("^\\s*using\\s+([\\w.]+)\\s*;", Pattern.MULTILINE);
     private static final Pattern HTTP_ATTR_RE = Pattern.compile("\\[(Http(?:Get|Post|Put|Delete|Patch))\\s*(?:\\(\"([^\"]*)\"\\))?\\]");
     private static final Pattern ROUTE_RE = Pattern.compile("\\[Route\\(\"([^\"]*)\"\\)\\]");
-    private static final Pattern API_CONTROLLER_RE = Pattern.compile("\\[ApiController\\]");
     private static final Pattern METHOD_RE = Pattern.compile("(?:public|protected|private|internal)\\s+(?:static\\s+|virtual\\s+|override\\s+|async\\s+|abstract\\s+)*(?:[\\w<>\\[\\]?,\\s]+)\\s+(\\w+)\\s*\\(");
 
     @Override
diff --git a/src/main/java/io/github/randomcodespace/iq/detector/jvm/java/GraphqlResolverDetector.java b/src/main/java/io/github/randomcodespace/iq/detector/jvm/java/GraphqlResolverDetector.java
index a20aa752..adcdef4c 100644
--- a/src/main/java/io/github/randomcodespace/iq/detector/jvm/java/GraphqlResolverDetector.java
+++ b/src/main/java/io/github/randomcodespace/iq/detector/jvm/java/GraphqlResolverDetector.java
@@ -34,7 +34,6 @@ public class GraphqlResolverDetector extends AbstractRegexDetector {
     private static final Pattern MUTATION_MAPPING_RE = Pattern.compile("@MutationMapping(?:\\s*\\(\\s*(?:name\\s*=\\s*)?\"([^\"]*)\"\\s*\\))?");
     private static final Pattern SUBSCRIPTION_MAPPING_RE = Pattern.compile("@SubscriptionMapping(?:\\s*\\(\\s*(?:name\\s*=\\s*)?\"([^\"]*)\"\\s*\\))?");
     private static final Pattern SCHEMA_MAPPING_RE = Pattern.compile("@SchemaMapping\\s*\\(\\s*(?:typeName\\s*=\\s*\"([^\"]*)\")?");
-    private static final Pattern BATCH_MAPPING_RE = Pattern.compile("@BatchMapping(?:\\s*\\(\\s*(?:field\\s*=\\s*)?\"([^\"]*)\"\\s*\\))?");
     private static final Pattern DGS_QUERY_RE = Pattern.compile("@DgsQuery(?:\\s*\\(\\s*field\\s*=\\s*\"([^\"]*)\"\\s*\\))?");
     private static final Pattern DGS_MUTATION_RE = Pattern.compile("@DgsMutation(?:\\s*\\(\\s*field\\s*=\\s*\"([^\"]*)\"\\s*\\))?");
     private static final Pattern DGS_SUBSCRIPTION_RE = Pattern.compile("@DgsSubscription(?:\\s*\\(\\s*field\\s*=\\s*\"([^\"]*)\"\\s*\\))?");
diff --git a/src/main/java/io/github/randomcodespace/iq/detector/jvm/java/JpaEntityDetector.java b/src/main/java/io/github/randomcodespace/iq/detector/jvm/java/JpaEntityDetector.java
index dc2feae7..f2c1dc7b 100644
--- a/src/main/java/io/github/randomcodespace/iq/detector/jvm/java/JpaEntityDetector.java
+++ b/src/main/java/io/github/randomcodespace/iq/detector/jvm/java/JpaEntityDetector.java
@@ -52,7 +52,6 @@ public class JpaEntityDetector extends AbstractJavaParserDetector {
             "ManyToMany", "many_to_many");
 
     // ---- Regex fallback patterns ----
-    private static final Pattern ENTITY_RE = Pattern.compile("@Entity");
     private static final Pattern TABLE_RE = Pattern.compile("@Table\\s*\\(\\s*(?:name\\s*=\\s*)?\"(\\w+)\"");
     private static final Pattern CLASS_RE = Pattern.compile("(?:public\\s+)?class\\s+(\\w+)");
     private static final Pattern COLUMN_RE = Pattern.compile("@Column\\s*\\(([^)]*)\\)");
diff --git a/src/main/java/io/github/randomcodespace/iq/detector/jvm/java/SpringRestDetector.java b/src/main/java/io/github/randomcodespace/iq/detector/jvm/java/SpringRestDetector.java
index b02b068e..c96a2f5a 100644
--- a/src/main/java/io/github/randomcodespace/iq/detector/jvm/java/SpringRestDetector.java
+++ b/src/main/java/io/github/randomcodespace/iq/detector/jvm/java/SpringRestDetector.java
@@ -34,7 +34,6 @@
 )
 @Component
 public class SpringRestDetector extends AbstractJavaParserDetector {
-    private static final String PROP_REQUESTMAPPING = "RequestMapping";
     private static final String PROP_CONSUMES = "consumes";
     private static final String PROP_PATH = "path";
     private static final String PROP_PRODUCES = "produces";
diff --git a/src/main/java/io/github/randomcodespace/iq/detector/jvm/kotlin/KotlinStructuresDetector.java b/src/main/java/io/github/randomcodespace/iq/detector/jvm/kotlin/KotlinStructuresDetector.java
index 2c971e2b..5d4f9ec1 100644
--- a/src/main/java/io/github/randomcodespace/iq/detector/jvm/kotlin/KotlinStructuresDetector.java
+++ b/src/main/java/io/github/randomcodespace/iq/detector/jvm/kotlin/KotlinStructuresDetector.java
@@ -1,7 +1,6 @@
 package io.github.randomcodespace.iq.detector.jvm.kotlin;
 
 import io.github.randomcodespace.iq.detector.AbstractAntlrDetector;
-import io.github.randomcodespace.iq.grammar.AntlrParserFactory;
 import io.github.randomcodespace.iq.detector.DetectorContext;
 import io.github.randomcodespace.iq.detector.DetectorResult;
 import io.github.randomcodespace.iq.detector.StructuresDetectorHelper;
diff --git a/src/main/java/io/github/randomcodespace/iq/detector/jvm/scala/ScalaStructuresDetector.java b/src/main/java/io/github/randomcodespace/iq/detector/jvm/scala/ScalaStructuresDetector.java
index b62902a2..441918d0 100644
--- a/src/main/java/io/github/randomcodespace/iq/detector/jvm/scala/ScalaStructuresDetector.java
+++ b/src/main/java/io/github/randomcodespace/iq/detector/jvm/scala/ScalaStructuresDetector.java
@@ -1,7 +1,6 @@
 package io.github.randomcodespace.iq.detector.jvm.scala;
 
 import io.github.randomcodespace.iq.detector.AbstractAntlrDetector;
-import io.github.randomcodespace.iq.grammar.AntlrParserFactory;
 import io.github.randomcodespace.iq.detector.DetectorContext;
 import io.github.randomcodespace.iq.detector.DetectorResult;
 import io.github.randomcodespace.iq.detector.StructuresDetectorHelper;
diff --git a/src/main/java/io/github/randomcodespace/iq/detector/structured/CloudFormationDetector.java b/src/main/java/io/github/randomcodespace/iq/detector/structured/CloudFormationDetector.java
index d3ec2ab7..35f1b8f0 100644
--- a/src/main/java/io/github/randomcodespace/iq/detector/structured/CloudFormationDetector.java
+++ b/src/main/java/io/github/randomcodespace/iq/detector/structured/CloudFormationDetector.java
@@ -187,7 +187,6 @@ private boolean isCfnTemplate(Map<String, Object> data) {
         return false;
     }
 
-    @SuppressWarnings("unchecked")
     private void collectRefs(Object value, Set<String> refs) {
         if (value instanceof Map<?, ?> map) {
             Object ref = map.get("Ref");
diff --git a/src/main/java/io/github/randomcodespace/iq/detector/structured/KubernetesDetector.java b/src/main/java/io/github/randomcodespace/iq/detector/structured/KubernetesDetector.java
index dc9d8a3a..c231f89d 100644
--- a/src/main/java/io/github/randomcodespace/iq/detector/structured/KubernetesDetector.java
+++ b/src/main/java/io/github/randomcodespace/iq/detector/structured/KubernetesDetector.java
@@ -263,7 +263,6 @@ private List<Map<String, Object>> getDocuments(DetectorContext ctx) {
         return List.of();
     }
 
-    @SuppressWarnings("unchecked")
     private List<Map<String, Object>> extractContainers(Map<String, Object> spec, String kind) {
         List<Map<String, Object>> containers = new ArrayList<>();
 
diff --git a/src/main/java/io/github/randomcodespace/iq/detector/systems/cpp/CppStructuresDetector.java b/src/main/java/io/github/randomcodespace/iq/detector/systems/cpp/CppStructuresDetector.java
index 90651988..7b6d89e0 100644
--- a/src/main/java/io/github/randomcodespace/iq/detector/systems/cpp/CppStructuresDetector.java
+++ b/src/main/java/io/github/randomcodespace/iq/detector/systems/cpp/CppStructuresDetector.java
@@ -1,7 +1,6 @@
 package io.github.randomcodespace.iq.detector.systems.cpp;
 
 import io.github.randomcodespace.iq.detector.AbstractAntlrDetector;
-import io.github.randomcodespace.iq.grammar.AntlrParserFactory;
 import io.github.randomcodespace.iq.detector.DetectorContext;
 import io.github.randomcodespace.iq.detector.DetectorResult;
 import io.github.randomcodespace.iq.model.CodeEdge;
diff --git a/src/main/java/io/github/randomcodespace/iq/detector/typescript/ExpressRouteDetector.java b/src/main/java/io/github/randomcodespace/iq/detector/typescript/ExpressRouteDetector.java
index 1303c501..893c3cea 100644
--- a/src/main/java/io/github/randomcodespace/iq/detector/typescript/ExpressRouteDetector.java
+++ b/src/main/java/io/github/randomcodespace/iq/detector/typescript/ExpressRouteDetector.java
@@ -2,7 +2,6 @@
 
 import io.github.randomcodespace.iq.detector.DetectorContext;
 import io.github.randomcodespace.iq.detector.DetectorResult;
-import io.github.randomcodespace.iq.grammar.AntlrParserFactory;
 import io.github.randomcodespace.iq.grammar.javascript.JavaScriptParser;
 import io.github.randomcodespace.iq.grammar.javascript.JavaScriptParserBaseListener;
 import io.github.randomcodespace.iq.model.CodeNode;
diff --git a/src/main/java/io/github/randomcodespace/iq/detector/typescript/SequelizeORMDetector.java b/src/main/java/io/github/randomcodespace/iq/detector/typescript/SequelizeORMDetector.java
index e46ae97b..a4425b14 100644
--- a/src/main/java/io/github/randomcodespace/iq/detector/typescript/SequelizeORMDetector.java
+++ b/src/main/java/io/github/randomcodespace/iq/detector/typescript/SequelizeORMDetector.java
@@ -38,10 +38,6 @@ public class SequelizeORMDetector extends AbstractTypeScriptDetector {
             "class\\s+(\\w+)\\s+extends\\s+Model\\s*\\{"
     );
 
-    private static final Pattern MODEL_INIT_RE = Pattern.compile(
-            "(\\w+)\\.init\\s*\\(\\s*\\{"
-    );
-
     private static final Pattern CONNECTION_RE = Pattern.compile(
             "new\\s+Sequelize(?:\\.Sequelize)?\\s*\\("
     );
diff --git a/src/main/java/io/github/randomcodespace/iq/flow/FlowRenderer.java b/src/main/java/io/github/randomcodespace/iq/flow/FlowRenderer.java
index 24804194..0691b82f 100644
--- a/src/main/java/io/github/randomcodespace/iq/flow/FlowRenderer.java
+++ b/src/main/java/io/github/randomcodespace/iq/flow/FlowRenderer.java
@@ -10,7 +10,6 @@
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.Comparator;
-import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.TreeMap;
 
diff --git a/src/main/java/io/github/randomcodespace/iq/grammar/golang/GoParserBase.java b/src/main/java/io/github/randomcodespace/iq/grammar/golang/GoParserBase.java
index e06a21fb..5d33e762 100644
--- a/src/main/java/io/github/randomcodespace/iq/grammar/golang/GoParserBase.java
+++ b/src/main/java/io/github/randomcodespace/iq/grammar/golang/GoParserBase.java
@@ -1,8 +1,6 @@
 package io.github.randomcodespace.iq.grammar.golang;
 
-import java.util.List;
 import org.antlr.v4.runtime.*;
-import java.io.PrintStream;
 import java.util.HashSet;
 import java.util.Set;
 
diff --git a/src/main/java/io/github/randomcodespace/iq/intelligence/extractor/go/GoLanguageExtractor.java b/src/main/java/io/github/randomcodespace/iq/intelligence/extractor/go/GoLanguageExtractor.java
index 57a4966d..e3e9f403 100644
--- a/src/main/java/io/github/randomcodespace/iq/intelligence/extractor/go/GoLanguageExtractor.java
+++ b/src/main/java/io/github/randomcodespace/iq/intelligence/extractor/go/GoLanguageExtractor.java
@@ -12,7 +12,6 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
diff --git a/src/test/java/io/github/randomcodespace/iq/analyzer/AnalyzerTest.java b/src/test/java/io/github/randomcodespace/iq/analyzer/AnalyzerTest.java
index 30c3d203..96920297 100644
--- a/src/test/java/io/github/randomcodespace/iq/analyzer/AnalyzerTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/analyzer/AnalyzerTest.java
@@ -1,7 +1,6 @@
 package io.github.randomcodespace.iq.analyzer;
 
 import io.github.randomcodespace.iq.analyzer.linker.Linker;
-import io.github.randomcodespace.iq.analyzer.linker.LinkResult;
 import io.github.randomcodespace.iq.config.CodeIqConfig;
 import io.github.randomcodespace.iq.detector.Detector;
 import io.github.randomcodespace.iq.detector.DetectorContext;
diff --git a/src/test/java/io/github/randomcodespace/iq/analyzer/BatchedStreamingTest.java b/src/test/java/io/github/randomcodespace/iq/analyzer/BatchedStreamingTest.java
index f2e46ae7..ba9c55b0 100644
--- a/src/test/java/io/github/randomcodespace/iq/analyzer/BatchedStreamingTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/analyzer/BatchedStreamingTest.java
@@ -1,6 +1,5 @@
 package io.github.randomcodespace.iq.analyzer;
 
-import io.github.randomcodespace.iq.analyzer.linker.Linker;
 import io.github.randomcodespace.iq.cache.AnalysisCache;
 import io.github.randomcodespace.iq.config.CodeIqConfig;
 import io.github.randomcodespace.iq.detector.Detector;
diff --git a/src/test/java/io/github/randomcodespace/iq/analyzer/FullAnalysisIntegrationTest.java b/src/test/java/io/github/randomcodespace/iq/analyzer/FullAnalysisIntegrationTest.java
index a411c42d..a4919058 100644
--- a/src/test/java/io/github/randomcodespace/iq/analyzer/FullAnalysisIntegrationTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/analyzer/FullAnalysisIntegrationTest.java
@@ -107,14 +107,10 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
 
-import io.github.randomcodespace.iq.model.CodeEdge;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.Comparator;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -135,7 +131,6 @@ class FullAnalysisIntegrationTest {
     /**
      * Build all detectors manually — no Spring context needed.
      */
-    @SuppressWarnings("unchecked")
     private static List<Detector> allDetectors() {
         // Use explicit Detector[] to avoid List.of() varargs inference issue with 90+ subtypes
         Detector[] detectors = {
diff --git a/src/test/java/io/github/randomcodespace/iq/analyzer/LayerClassifierTest.java b/src/test/java/io/github/randomcodespace/iq/analyzer/LayerClassifierTest.java
index b721956b..b1012150 100644
--- a/src/test/java/io/github/randomcodespace/iq/analyzer/LayerClassifierTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/analyzer/LayerClassifierTest.java
@@ -3,8 +3,6 @@
 import io.github.randomcodespace.iq.model.CodeNode;
 import io.github.randomcodespace.iq.model.NodeKind;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.EnumSource;
 
 import java.util.List;
 import java.util.Map;
diff --git a/src/test/java/io/github/randomcodespace/iq/analyzer/StructuredParserTest.java b/src/test/java/io/github/randomcodespace/iq/analyzer/StructuredParserTest.java
index 795c6b2e..fd34d870 100644
--- a/src/test/java/io/github/randomcodespace/iq/analyzer/StructuredParserTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/analyzer/StructuredParserTest.java
@@ -25,12 +25,6 @@ private Map<String, Object> asWrapper(Object result) {
         return (Map<String, Object>) result;
     }
 
-    @SuppressWarnings("unchecked")
-    private <T> T getData(Object result) {
-        Map<String, Object> wrapper = asWrapper(result);
-        return (T) wrapper.get("data");
-    }
-
     // ---- YAML ----
 
     @Test
diff --git a/src/test/java/io/github/randomcodespace/iq/api/FlowControllerTest.java b/src/test/java/io/github/randomcodespace/iq/api/FlowControllerTest.java
index b3cb4f47..a9dd5dd7 100644
--- a/src/test/java/io/github/randomcodespace/iq/api/FlowControllerTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/api/FlowControllerTest.java
@@ -12,11 +12,8 @@
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 
 import java.util.LinkedHashMap;
-import java.util.List;
 import java.util.Map;
 
-import static org.hamcrest.Matchers.hasKey;
-import static org.hamcrest.Matchers.is;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.when;
diff --git a/src/test/java/io/github/randomcodespace/iq/api/GraphControllerTest.java b/src/test/java/io/github/randomcodespace/iq/api/GraphControllerTest.java
index 30257617..8455b2ef 100644
--- a/src/test/java/io/github/randomcodespace/iq/api/GraphControllerTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/api/GraphControllerTest.java
@@ -12,7 +12,6 @@
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 
-import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
diff --git a/src/test/java/io/github/randomcodespace/iq/api/TopologyControllerExtendedTest.java b/src/test/java/io/github/randomcodespace/iq/api/TopologyControllerExtendedTest.java
index b6807e1b..9b158765 100644
--- a/src/test/java/io/github/randomcodespace/iq/api/TopologyControllerExtendedTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/api/TopologyControllerExtendedTest.java
@@ -15,8 +15,6 @@
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 
-import java.io.IOException;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -24,9 +22,7 @@
 import java.util.List;
 import java.util.Map;
 
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyList;
-import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.*;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
diff --git a/src/test/java/io/github/randomcodespace/iq/api/TopologyControllerTest.java b/src/test/java/io/github/randomcodespace/iq/api/TopologyControllerTest.java
index ad5c73e4..b52caee2 100644
--- a/src/test/java/io/github/randomcodespace/iq/api/TopologyControllerTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/api/TopologyControllerTest.java
@@ -1,23 +1,13 @@
 package io.github.randomcodespace.iq.api;
 
-import io.github.randomcodespace.iq.config.CodeIqConfig;
 import io.github.randomcodespace.iq.query.TopologyService;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.http.MediaType;
-import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 
-import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
 
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.when;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
 
diff --git a/src/test/java/io/github/randomcodespace/iq/api/TopologyEndpointTest.java b/src/test/java/io/github/randomcodespace/iq/api/TopologyEndpointTest.java
index 97527837..9457eaaa 100644
--- a/src/test/java/io/github/randomcodespace/iq/api/TopologyEndpointTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/api/TopologyEndpointTest.java
@@ -6,8 +6,6 @@
 import io.github.randomcodespace.iq.config.CodeIqConfig;
 import io.github.randomcodespace.iq.graph.GraphStore;
 import io.github.randomcodespace.iq.mcp.McpTools;
-import io.github.randomcodespace.iq.model.CodeEdge;
-import io.github.randomcodespace.iq.model.CodeNode;
 import io.github.randomcodespace.iq.query.QueryService;
 import io.github.randomcodespace.iq.query.StatsService;
 import io.github.randomcodespace.iq.query.TopologyService;
diff --git a/src/test/java/io/github/randomcodespace/iq/cache/CacheCoverageTest.java b/src/test/java/io/github/randomcodespace/iq/cache/CacheCoverageTest.java
index a71698e1..0f8c6ecc 100644
--- a/src/test/java/io/github/randomcodespace/iq/cache/CacheCoverageTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/cache/CacheCoverageTest.java
@@ -14,7 +14,6 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
diff --git a/src/test/java/io/github/randomcodespace/iq/cli/BundleCommandExtendedTest.java b/src/test/java/io/github/randomcodespace/iq/cli/BundleCommandExtendedTest.java
index 5a47f8da..65bbd2dc 100644
--- a/src/test/java/io/github/randomcodespace/iq/cli/BundleCommandExtendedTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/cli/BundleCommandExtendedTest.java
@@ -2,7 +2,6 @@
 
 import io.github.randomcodespace.iq.config.CodeIqConfig;
 import io.github.randomcodespace.iq.flow.FlowEngine;
-import io.github.randomcodespace.iq.graph.GraphStore;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -20,7 +19,6 @@
 import java.util.zip.ZipFile;
 
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.when;
 import io.github.randomcodespace.iq.config.CodeIqConfigTestSupport;
 
diff --git a/src/test/java/io/github/randomcodespace/iq/cli/FlowCommandExtendedTest.java b/src/test/java/io/github/randomcodespace/iq/cli/FlowCommandExtendedTest.java
index fe97e0df..203a80ab 100644
--- a/src/test/java/io/github/randomcodespace/iq/cli/FlowCommandExtendedTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/cli/FlowCommandExtendedTest.java
@@ -2,7 +2,6 @@
 
 import io.github.randomcodespace.iq.config.CodeIqConfig;
 import io.github.randomcodespace.iq.flow.FlowEngine;
-import io.github.randomcodespace.iq.flow.FlowModels.FlowDiagram;
 import io.github.randomcodespace.iq.graph.GraphStore;
 import io.github.randomcodespace.iq.model.CodeNode;
 import io.github.randomcodespace.iq.model.NodeKind;
@@ -22,7 +21,6 @@
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.*;
 
diff --git a/src/test/java/io/github/randomcodespace/iq/cli/GraphCommandTest.java b/src/test/java/io/github/randomcodespace/iq/cli/GraphCommandTest.java
index 749ed961..69b77321 100644
--- a/src/test/java/io/github/randomcodespace/iq/cli/GraphCommandTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/cli/GraphCommandTest.java
@@ -6,12 +6,10 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.Path;
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/src/test/java/io/github/randomcodespace/iq/cli/TopologyCommandExtendedTest.java b/src/test/java/io/github/randomcodespace/iq/cli/TopologyCommandExtendedTest.java
index 4f7d5cab..e0066429 100644
--- a/src/test/java/io/github/randomcodespace/iq/cli/TopologyCommandExtendedTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/cli/TopologyCommandExtendedTest.java
@@ -23,9 +23,7 @@
 import java.util.Map;
 
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyList;
-import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.*;
 import io.github.randomcodespace.iq.config.CodeIqConfigTestSupport;
 
diff --git a/src/test/java/io/github/randomcodespace/iq/cli/VersionCommandTest.java b/src/test/java/io/github/randomcodespace/iq/cli/VersionCommandTest.java
index 1ae7921f..f8eb141b 100644
--- a/src/test/java/io/github/randomcodespace/iq/cli/VersionCommandTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/cli/VersionCommandTest.java
@@ -3,7 +3,6 @@
 import io.github.randomcodespace.iq.detector.Detector;
 import io.github.randomcodespace.iq.detector.DetectorRegistry;
 import org.junit.jupiter.api.Test;
-import picocli.CommandLine;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
diff --git a/src/test/java/io/github/randomcodespace/iq/config/GraphBootstrapperTest.java b/src/test/java/io/github/randomcodespace/iq/config/GraphBootstrapperTest.java
index 0386acff..45e151a4 100644
--- a/src/test/java/io/github/randomcodespace/iq/config/GraphBootstrapperTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/config/GraphBootstrapperTest.java
@@ -20,7 +20,6 @@
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
-@SuppressWarnings("unchecked")
 class GraphBootstrapperTest {
 
     private GraphStore graphStore;
diff --git a/src/test/java/io/github/randomcodespace/iq/detector/AbstractAntlrDetectorHelperTest.java b/src/test/java/io/github/randomcodespace/iq/detector/AbstractAntlrDetectorHelperTest.java
index f9580fa0..4d1347ba 100644
--- a/src/test/java/io/github/randomcodespace/iq/detector/AbstractAntlrDetectorHelperTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/detector/AbstractAntlrDetectorHelperTest.java
@@ -31,10 +31,6 @@ private static final class TestAntlrDetector extends AbstractAntlrDetector {
         int exposedLineOf(ParserRuleContext ctx) { return lineOf(ctx); }
 
         String exposedTextOf(ParserRuleContext ctx) { return textOf(ctx); }
-
-        String exposedOriginalTextOf(ParserRuleContext ctx, CommonTokenStream tokens) {
-            return originalTextOf(ctx, tokens);
-        }
     }
 
     private final TestAntlrDetector detector = new TestAntlrDetector();
diff --git a/src/test/java/io/github/randomcodespace/iq/detector/AntlrInfrastructureTest.java b/src/test/java/io/github/randomcodespace/iq/detector/AntlrInfrastructureTest.java
index 48f3bb6d..cd793318 100644
--- a/src/test/java/io/github/randomcodespace/iq/detector/AntlrInfrastructureTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/detector/AntlrInfrastructureTest.java
@@ -7,7 +7,6 @@
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.CountDownLatch;
diff --git a/src/test/java/io/github/randomcodespace/iq/detector/DetectorInfoAnnotationTest.java b/src/test/java/io/github/randomcodespace/iq/detector/DetectorInfoAnnotationTest.java
index aa6af979..747e2a6c 100644
--- a/src/test/java/io/github/randomcodespace/iq/detector/DetectorInfoAnnotationTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/detector/DetectorInfoAnnotationTest.java
@@ -1,12 +1,10 @@
 package io.github.randomcodespace.iq.detector;
 
-import io.github.randomcodespace.iq.model.NodeKind;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
diff --git a/src/test/java/io/github/randomcodespace/iq/detector/frontend/FrontendDetectorsExtendedTest.java b/src/test/java/io/github/randomcodespace/iq/detector/frontend/FrontendDetectorsExtendedTest.java
index d679dede..61879168 100644
--- a/src/test/java/io/github/randomcodespace/iq/detector/frontend/FrontendDetectorsExtendedTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/detector/frontend/FrontendDetectorsExtendedTest.java
@@ -1,7 +1,6 @@
 package io.github.randomcodespace.iq.detector.frontend;
 
 import io.github.randomcodespace.iq.detector.DetectorContext;
-import io.github.randomcodespace.iq.detector.DetectorResult;
 import io.github.randomcodespace.iq.detector.DetectorTestUtils;
 import io.github.randomcodespace.iq.model.NodeKind;
 import org.junit.jupiter.api.Nested;
diff --git a/src/test/java/io/github/randomcodespace/iq/detector/generic/GenericImportsExtendedTest.java b/src/test/java/io/github/randomcodespace/iq/detector/generic/GenericImportsExtendedTest.java
index 3cbda629..030e0f95 100644
--- a/src/test/java/io/github/randomcodespace/iq/detector/generic/GenericImportsExtendedTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/detector/generic/GenericImportsExtendedTest.java
@@ -1,6 +1,5 @@
 package io.github.randomcodespace.iq.detector.generic;
 
-import io.github.randomcodespace.iq.detector.DetectorContext;
 import io.github.randomcodespace.iq.detector.DetectorTestUtils;
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/io/github/randomcodespace/iq/detector/jvm/java/ClassHierarchyDetectorExtendedTest.java b/src/test/java/io/github/randomcodespace/iq/detector/jvm/java/ClassHierarchyDetectorExtendedTest.java
index 1275163c..7aa6536f 100644
--- a/src/test/java/io/github/randomcodespace/iq/detector/jvm/java/ClassHierarchyDetectorExtendedTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/detector/jvm/java/ClassHierarchyDetectorExtendedTest.java
@@ -1,13 +1,11 @@
 package io.github.randomcodespace.iq.detector.jvm.java;
 
 import io.github.randomcodespace.iq.detector.DetectorContext;
-import io.github.randomcodespace.iq.detector.DetectorResult;
 import io.github.randomcodespace.iq.detector.DetectorTestUtils;
 import io.github.randomcodespace.iq.model.EdgeKind;
 import io.github.randomcodespace.iq.model.NodeKind;
 import org.junit.jupiter.api.Test;
 
-import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.*;
 
diff --git a/src/test/java/io/github/randomcodespace/iq/detector/jvm/java/JavaDetectorsBranchCoverageTest.java b/src/test/java/io/github/randomcodespace/iq/detector/jvm/java/JavaDetectorsBranchCoverageTest.java
index 1fea8b7f..ee57d76c 100644
--- a/src/test/java/io/github/randomcodespace/iq/detector/jvm/java/JavaDetectorsBranchCoverageTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/detector/jvm/java/JavaDetectorsBranchCoverageTest.java
@@ -1,7 +1,6 @@
 package io.github.randomcodespace.iq.detector.jvm.java;
 
 import io.github.randomcodespace.iq.detector.DetectorContext;
-import io.github.randomcodespace.iq.detector.DetectorResult;
 import io.github.randomcodespace.iq.detector.DetectorTestUtils;
 import io.github.randomcodespace.iq.model.EdgeKind;
 import io.github.randomcodespace.iq.model.NodeKind;
@@ -10,7 +9,6 @@
 
 import java.util.List;
 
-import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
 
 /**
@@ -456,7 +454,6 @@ public class ItemController {
                     """;
             var r = d.detect(ctx("java", code));
             assertFalse(r.nodes().isEmpty());
-            @SuppressWarnings("unchecked")
             var params = (List<?>) r.nodes().get(0).getProperties().get("parameters");
             assertNotNull(params);
             assertFalse(params.isEmpty());
@@ -687,7 +684,6 @@ public void adminOnly() {}
                     """;
             var r = d.detect(ctx("java", code));
             assertFalse(r.nodes().isEmpty());
-            @SuppressWarnings("unchecked")
             var roles = (List<?>) r.nodes().get(0).getProperties().get("roles");
             assertNotNull(roles);
             assertTrue(roles.contains("ADMIN"));
@@ -704,7 +700,6 @@ public void editContent() {}
                     """;
             var r = d.detect(ctx("java", code));
             assertFalse(r.nodes().isEmpty());
-            @SuppressWarnings("unchecked")
             var roles = (List<?>) r.nodes().get(0).getProperties().get("roles");
             assertNotNull(roles);
             assertFalse(roles.isEmpty());
@@ -721,7 +716,6 @@ public void generateReport() {}
                     """;
             var r = d.detect(ctx("java", code));
             assertFalse(r.nodes().isEmpty());
-            @SuppressWarnings("unchecked")
             var roles = (List<?>) r.nodes().get(0).getProperties().get("roles");
             assertNotNull(roles);
         }
@@ -879,7 +873,6 @@ public class Product {
                     """;
             var r = d.detect(ctx("java", code));
             assertFalse(r.nodes().isEmpty());
-            @SuppressWarnings("unchecked")
             var columns = (List<?>) r.nodes().get(0).getProperties().get("columns");
             assertNotNull(columns);
         }
@@ -1135,7 +1128,6 @@ public class SearchService {
                     """;
             var r = d.detect(ctx("java", code));
             assertFalse(r.nodes().isEmpty());
-            @SuppressWarnings("unchecked")
             var params = (List<?>) r.nodes().get(0).getProperties().get("parameters");
             assertEquals(3, params.size());
         }
diff --git a/src/test/java/io/github/randomcodespace/iq/detector/jvm/java/JavaDetectorsCoverageTest.java b/src/test/java/io/github/randomcodespace/iq/detector/jvm/java/JavaDetectorsCoverageTest.java
index eef39758..86162c89 100644
--- a/src/test/java/io/github/randomcodespace/iq/detector/jvm/java/JavaDetectorsCoverageTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/detector/jvm/java/JavaDetectorsCoverageTest.java
@@ -1,7 +1,6 @@
 package io.github.randomcodespace.iq.detector.jvm.java;
 
 import io.github.randomcodespace.iq.detector.DetectorContext;
-import io.github.randomcodespace.iq.detector.DetectorResult;
 import io.github.randomcodespace.iq.detector.DetectorTestUtils;
 import io.github.randomcodespace.iq.model.EdgeKind;
 import io.github.randomcodespace.iq.model.NodeKind;
@@ -933,7 +932,6 @@ public interface OrderRepository extends JpaRepository<Order, Long> {
                     """;
             var r = d.detect(ctx("java", code));
             assertFalse(r.nodes().isEmpty());
-            @SuppressWarnings("unchecked")
             var queries = (java.util.List<?>) r.nodes().get(0).getProperties().get("custom_queries");
             assertNotNull(queries);
             assertEquals(2, queries.size());
diff --git a/src/test/java/io/github/randomcodespace/iq/detector/jvm/java/JavaDetectorsExtendedTest.java b/src/test/java/io/github/randomcodespace/iq/detector/jvm/java/JavaDetectorsExtendedTest.java
index ffa0805a..62af23da 100644
--- a/src/test/java/io/github/randomcodespace/iq/detector/jvm/java/JavaDetectorsExtendedTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/detector/jvm/java/JavaDetectorsExtendedTest.java
@@ -1,7 +1,6 @@
 package io.github.randomcodespace.iq.detector.jvm.java;
 
 import io.github.randomcodespace.iq.detector.DetectorContext;
-import io.github.randomcodespace.iq.detector.DetectorResult;
 import io.github.randomcodespace.iq.detector.DetectorTestUtils;
 import io.github.randomcodespace.iq.model.NodeKind;
 import org.junit.jupiter.api.Nested;
diff --git a/src/test/java/io/github/randomcodespace/iq/detector/jvm/java/JavaDetectorsTest.java b/src/test/java/io/github/randomcodespace/iq/detector/jvm/java/JavaDetectorsTest.java
index f9a58e2a..6f95bb1a 100644
--- a/src/test/java/io/github/randomcodespace/iq/detector/jvm/java/JavaDetectorsTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/detector/jvm/java/JavaDetectorsTest.java
@@ -1,7 +1,6 @@
 package io.github.randomcodespace.iq.detector.jvm.java;
 
 import io.github.randomcodespace.iq.detector.DetectorContext;
-import io.github.randomcodespace.iq.detector.DetectorResult;
 import io.github.randomcodespace.iq.detector.DetectorTestUtils;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/io/github/randomcodespace/iq/detector/jvm/java/JpaEntityDetectorExtendedTest.java b/src/test/java/io/github/randomcodespace/iq/detector/jvm/java/JpaEntityDetectorExtendedTest.java
index 8a0ff3dd..58226685 100644
--- a/src/test/java/io/github/randomcodespace/iq/detector/jvm/java/JpaEntityDetectorExtendedTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/detector/jvm/java/JpaEntityDetectorExtendedTest.java
@@ -1,7 +1,6 @@
 package io.github.randomcodespace.iq.detector.jvm.java;
 
 import io.github.randomcodespace.iq.detector.DetectorContext;
-import io.github.randomcodespace.iq.detector.DetectorResult;
 import io.github.randomcodespace.iq.detector.DetectorTestUtils;
 import io.github.randomcodespace.iq.model.EdgeKind;
 import io.github.randomcodespace.iq.model.NodeKind;
@@ -146,7 +145,6 @@ public class Customer {
         assertFalse(result.nodes().isEmpty());
         var entity = result.nodes().stream()
                 .filter(n -> n.getKind() == NodeKind.ENTITY).findFirst().orElseThrow();
-        @SuppressWarnings("unchecked")
         var columns = (List<?>) entity.getProperties().get("columns");
         assertNotNull(columns, "Entity with @Id and @Column should have columns property");
         assertFalse(columns.isEmpty());
@@ -260,7 +258,6 @@ public class Product {
                 """;
         var result = detector.detect(ctx(code));
         assertFalse(result.nodes().isEmpty());
-        @SuppressWarnings("unchecked")
         var columns = (List<?>) result.nodes().stream()
                 .filter(n -> n.getKind() == NodeKind.ENTITY).findFirst().orElseThrow()
                 .getProperties().get("columns");
@@ -487,7 +484,6 @@ void regexFallback_detectsColumnAnnotation() {
         assertFalse(result.nodes().isEmpty());
         var entity = result.nodes().stream()
                 .filter(n -> n.getKind() == NodeKind.ENTITY).findFirst().orElseThrow();
-        @SuppressWarnings("unchecked")
         var columns = (List<?>) entity.getProperties().get("columns");
         assertNotNull(columns, "regex fallback should extract @Column annotations");
         assertFalse(columns.isEmpty());
diff --git a/src/test/java/io/github/randomcodespace/iq/detector/jvm/java/PublicApiDetectorTest.java b/src/test/java/io/github/randomcodespace/iq/detector/jvm/java/PublicApiDetectorTest.java
index 48ba089a..32c3a60f 100644
--- a/src/test/java/io/github/randomcodespace/iq/detector/jvm/java/PublicApiDetectorTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/detector/jvm/java/PublicApiDetectorTest.java
@@ -1,7 +1,6 @@
 package io.github.randomcodespace.iq.detector.jvm.java;
 
 import io.github.randomcodespace.iq.detector.DetectorContext;
-import io.github.randomcodespace.iq.detector.DetectorResult;
 import io.github.randomcodespace.iq.detector.DetectorTestUtils;
 import io.github.randomcodespace.iq.model.EdgeKind;
 import io.github.randomcodespace.iq.model.NodeKind;
@@ -270,7 +269,6 @@ public class HealthService {
                 """;
         var result = detector.detect(ctx(code));
         assertFalse(result.nodes().isEmpty());
-        @SuppressWarnings("unchecked")
         var params = (List<?>) result.nodes().get(0).getProperties().get("parameters");
         assertNotNull(params);
         assertTrue(params.isEmpty(), "Method with no parameters should have empty params list");
@@ -492,7 +490,6 @@ void regexFallback_detectsMethodWithMultipleParams() {
                 + "}";
         var result = detector.detect(ctx(code));
         assertFalse(result.nodes().isEmpty(), "regex fallback should detect method with multiple params");
-        @SuppressWarnings("unchecked")
         var params = (List<?>) result.nodes().get(0).getProperties().get("parameters");
         assertNotNull(params);
         assertFalse(params.isEmpty(), "Parameters should be extracted in regex fallback");
diff --git a/src/test/java/io/github/randomcodespace/iq/detector/jvm/java/SpringRestDetectorExtendedTest.java b/src/test/java/io/github/randomcodespace/iq/detector/jvm/java/SpringRestDetectorExtendedTest.java
index e6e271d0..92c94159 100644
--- a/src/test/java/io/github/randomcodespace/iq/detector/jvm/java/SpringRestDetectorExtendedTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/detector/jvm/java/SpringRestDetectorExtendedTest.java
@@ -1,7 +1,6 @@
 package io.github.randomcodespace.iq.detector.jvm.java;
 
 import io.github.randomcodespace.iq.detector.DetectorContext;
-import io.github.randomcodespace.iq.detector.DetectorResult;
 import io.github.randomcodespace.iq.detector.DetectorTestUtils;
 import io.github.randomcodespace.iq.model.EdgeKind;
 import io.github.randomcodespace.iq.model.NodeKind;
@@ -125,7 +124,6 @@ public String getFile(
         var endpoints = result.nodes().stream()
                 .filter(n -> n.getKind() == NodeKind.ENDPOINT).toList();
         assertEquals(1, endpoints.size());
-        @SuppressWarnings("unchecked")
         var params = (List<?>) endpoints.get(0).getProperties().get("parameters");
         assertNotNull(params);
         assertEquals(3, params.size());
@@ -148,7 +146,6 @@ public class AuthController {
         var endpoints = result.nodes().stream()
                 .filter(n -> n.getKind() == NodeKind.ENDPOINT).toList();
         assertFalse(endpoints.isEmpty());
-        @SuppressWarnings("unchecked")
         var params = (List<?>) endpoints.get(0).getProperties().get("parameters");
         assertNotNull(params);
     }
diff --git a/src/test/java/io/github/randomcodespace/iq/detector/jvm/java/SpringSecurityDetectorExtendedTest.java b/src/test/java/io/github/randomcodespace/iq/detector/jvm/java/SpringSecurityDetectorExtendedTest.java
index da53179f..8d917cce 100644
--- a/src/test/java/io/github/randomcodespace/iq/detector/jvm/java/SpringSecurityDetectorExtendedTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/detector/jvm/java/SpringSecurityDetectorExtendedTest.java
@@ -1,7 +1,6 @@
 package io.github.randomcodespace.iq.detector.jvm.java;
 
 import io.github.randomcodespace.iq.detector.DetectorContext;
-import io.github.randomcodespace.iq.detector.DetectorResult;
 import io.github.randomcodespace.iq.detector.DetectorTestUtils;
 import io.github.randomcodespace.iq.model.NodeKind;
 import org.junit.jupiter.api.Test;
@@ -40,7 +39,6 @@ public void editDocument(Long id) {}
         var node = result.nodes().get(0);
         assertEquals(NodeKind.GUARD, node.getKind());
         assertEquals("spring_security", node.getProperties().get("auth_type"));
-        @SuppressWarnings("unchecked")
         var roles = (List<?>) node.getProperties().get("roles");
         assertNotNull(roles);
         assertFalse(roles.isEmpty(), "SpEL with hasRole/hasAnyRole should extract roles");
@@ -58,7 +56,6 @@ public void generateReport() {}
                 """;
         var result = detector.detect(ctx(code));
         assertFalse(result.nodes().isEmpty());
-        @SuppressWarnings("unchecked")
         var roles = (List<?>) result.nodes().get(0).getProperties().get("roles");
         assertNotNull(roles);
         assertEquals(3, roles.size(), "All roles in hasAnyRole should be extracted");
@@ -124,7 +121,6 @@ public void performAdminAction() {}
         assertFalse(result.nodes().isEmpty());
         var node = result.nodes().get(0);
         assertEquals("@Secured", node.getLabel());
-        @SuppressWarnings("unchecked")
         var roles = (List<?>) node.getProperties().get("roles");
         assertNotNull(roles);
         assertTrue(roles.contains("ROLE_ADMIN"));
@@ -142,7 +138,6 @@ public void sensitiveOperation() {}
                 """;
         var result = detector.detect(ctx(code));
         assertFalse(result.nodes().isEmpty());
-        @SuppressWarnings("unchecked")
         var roles = (List<?>) result.nodes().get(0).getProperties().get("roles");
         assertNotNull(roles);
         assertEquals(3, roles.size(), "All roles in @Secured array should be extracted");
@@ -166,7 +161,6 @@ public void manageStock() {}
         var result = detector.detect(ctx(code));
         assertFalse(result.nodes().isEmpty());
         assertEquals("@RolesAllowed", result.nodes().get(0).getLabel());
-        @SuppressWarnings("unchecked")
         var roles = (List<?>) result.nodes().get(0).getProperties().get("roles");
         assertNotNull(roles);
     }
@@ -183,7 +177,6 @@ public void publishContent() {}
                 """;
         var result = detector.detect(ctx(code));
         assertFalse(result.nodes().isEmpty());
-        @SuppressWarnings("unchecked")
         var roles = (List<?>) result.nodes().get(0).getProperties().get("roles");
         assertNotNull(roles);
         assertFalse(roles.isEmpty());
@@ -402,7 +395,6 @@ void regexFallback_detectsSecuredSingleRole() {
                 + "}";
         var result = detector.detect(ctx(code));
         assertFalse(result.nodes().isEmpty(), "regex fallback should detect @Secured single role");
-        @SuppressWarnings("unchecked")
         var roles = (List<?>) result.nodes().get(0).getProperties().get("roles");
         assertNotNull(roles);
         assertTrue(roles.contains("ROLE_ADMIN"));
@@ -416,7 +408,6 @@ void regexFallback_detectsSecuredMultipleRoles() {
                 + "}";
         var result = detector.detect(ctx(code));
         assertFalse(result.nodes().isEmpty(), "regex fallback should detect @Secured with multiple roles");
-        @SuppressWarnings("unchecked")
         var roles = (List<?>) result.nodes().get(0).getProperties().get("roles");
         assertNotNull(roles);
         assertEquals(2, roles.size());
@@ -430,7 +421,6 @@ void regexFallback_detectsPreAuthorizeWithHasRole() {
                 + "}";
         var result = detector.detect(ctx(code));
         assertFalse(result.nodes().isEmpty(), "regex fallback should detect @PreAuthorize");
-        @SuppressWarnings("unchecked")
         var roles = (List<?>) result.nodes().get(0).getProperties().get("roles");
         assertNotNull(roles);
         assertTrue(roles.contains("ANALYST"));
@@ -444,7 +434,6 @@ void regexFallback_detectsPreAuthorizeWithHasAnyRole() {
                 + "}";
         var result = detector.detect(ctx(code));
         assertFalse(result.nodes().isEmpty(), "regex fallback should detect @PreAuthorize with hasAnyRole");
-        @SuppressWarnings("unchecked")
         var roles = (List<?>) result.nodes().get(0).getProperties().get("roles");
         assertNotNull(roles);
         assertFalse(roles.isEmpty());
diff --git a/src/test/java/io/github/randomcodespace/iq/detector/python/KafkaPythonDetectorTest.java b/src/test/java/io/github/randomcodespace/iq/detector/python/KafkaPythonDetectorTest.java
index f27fe663..a5e310d9 100644
--- a/src/test/java/io/github/randomcodespace/iq/detector/python/KafkaPythonDetectorTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/detector/python/KafkaPythonDetectorTest.java
@@ -4,7 +4,6 @@
 import io.github.randomcodespace.iq.detector.DetectorResult;
 import io.github.randomcodespace.iq.detector.DetectorTestUtils;
 import io.github.randomcodespace.iq.model.EdgeKind;
-import io.github.randomcodespace.iq.model.NodeKind;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
diff --git a/src/test/java/io/github/randomcodespace/iq/detector/python/PydanticModelDetectorExtendedTest.java b/src/test/java/io/github/randomcodespace/iq/detector/python/PydanticModelDetectorExtendedTest.java
index 63a6bbb3..a8300de7 100644
--- a/src/test/java/io/github/randomcodespace/iq/detector/python/PydanticModelDetectorExtendedTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/detector/python/PydanticModelDetectorExtendedTest.java
@@ -3,7 +3,6 @@
 import io.github.randomcodespace.iq.detector.DetectorContext;
 import io.github.randomcodespace.iq.detector.DetectorResult;
 import io.github.randomcodespace.iq.detector.DetectorTestUtils;
-import io.github.randomcodespace.iq.model.EdgeKind;
 import io.github.randomcodespace.iq.model.NodeKind;
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/io/github/randomcodespace/iq/detector/python/PydanticModelDetectorTest.java b/src/test/java/io/github/randomcodespace/iq/detector/python/PydanticModelDetectorTest.java
index b5f1fac0..d77b8171 100644
--- a/src/test/java/io/github/randomcodespace/iq/detector/python/PydanticModelDetectorTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/detector/python/PydanticModelDetectorTest.java
@@ -3,7 +3,6 @@
 import io.github.randomcodespace.iq.detector.DetectorContext;
 import io.github.randomcodespace.iq.detector.DetectorResult;
 import io.github.randomcodespace.iq.detector.DetectorTestUtils;
-import io.github.randomcodespace.iq.model.EdgeKind;
 import io.github.randomcodespace.iq.model.NodeKind;
 import org.junit.jupiter.api.Test;
 
@@ -289,7 +288,6 @@ class Item(BaseModel):
         DetectorResult result = detector.detect(ctx);
 
         var node = result.nodes().stream().filter(n -> n.getKind() == NodeKind.ENTITY).findFirst().orElseThrow();
-        @SuppressWarnings("unchecked")
         var fields = (List<?>) node.getProperties().get("fields");
         assertNotNull(fields);
         assertFalse(fields.isEmpty(), "fields should be extracted in regex fallback");
diff --git a/src/test/java/io/github/randomcodespace/iq/detector/python/SQLAlchemyModelDetectorTest.java b/src/test/java/io/github/randomcodespace/iq/detector/python/SQLAlchemyModelDetectorTest.java
index eda3409b..e52bd9d6 100644
--- a/src/test/java/io/github/randomcodespace/iq/detector/python/SQLAlchemyModelDetectorTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/detector/python/SQLAlchemyModelDetectorTest.java
@@ -276,7 +276,6 @@ class Product(Base):
         DetectorResult result = detector.detect(ctx);
 
         var entity = result.nodes().stream().filter(n -> n.getKind() == NodeKind.ENTITY).findFirst().orElseThrow();
-        @SuppressWarnings("unchecked")
         var columns = (List<?>) entity.getProperties().get("columns");
         assertNotNull(columns);
         assertFalse(columns.isEmpty(), "regex fallback should extract columns");
diff --git a/src/test/java/io/github/randomcodespace/iq/detector/structured/CloudFormationDetectorTest.java b/src/test/java/io/github/randomcodespace/iq/detector/structured/CloudFormationDetectorTest.java
index 493e6593..c3049e10 100644
--- a/src/test/java/io/github/randomcodespace/iq/detector/structured/CloudFormationDetectorTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/detector/structured/CloudFormationDetectorTest.java
@@ -7,7 +7,6 @@
 import io.github.randomcodespace.iq.model.NodeKind;
 import org.junit.jupiter.api.Test;
 
-import java.util.List;
 import java.util.Map;
 
 import static org.junit.jupiter.api.Assertions.*;
diff --git a/src/test/java/io/github/randomcodespace/iq/detector/structured/ConfigDetectorsExtendedTest.java b/src/test/java/io/github/randomcodespace/iq/detector/structured/ConfigDetectorsExtendedTest.java
index d9c6c6d4..07636fea 100644
--- a/src/test/java/io/github/randomcodespace/iq/detector/structured/ConfigDetectorsExtendedTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/detector/structured/ConfigDetectorsExtendedTest.java
@@ -1,8 +1,6 @@
 package io.github.randomcodespace.iq.detector.structured;
 
 import io.github.randomcodespace.iq.detector.DetectorContext;
-import io.github.randomcodespace.iq.detector.DetectorTestUtils;
-import io.github.randomcodespace.iq.model.NodeKind;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/io/github/randomcodespace/iq/detector/structured/KubernetesDetectorExpandedTest.java b/src/test/java/io/github/randomcodespace/iq/detector/structured/KubernetesDetectorExpandedTest.java
index e208f961..ec2f8dd6 100644
--- a/src/test/java/io/github/randomcodespace/iq/detector/structured/KubernetesDetectorExpandedTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/detector/structured/KubernetesDetectorExpandedTest.java
@@ -4,7 +4,6 @@
 import io.github.randomcodespace.iq.detector.DetectorResult;
 import io.github.randomcodespace.iq.model.EdgeKind;
 import io.github.randomcodespace.iq.model.NodeKind;
-import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 
 import java.util.List;
diff --git a/src/test/java/io/github/randomcodespace/iq/detector/systems/rust/RustDetectorsExtendedTest.java b/src/test/java/io/github/randomcodespace/iq/detector/systems/rust/RustDetectorsExtendedTest.java
index fe325484..8fcd3a94 100644
--- a/src/test/java/io/github/randomcodespace/iq/detector/systems/rust/RustDetectorsExtendedTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/detector/systems/rust/RustDetectorsExtendedTest.java
@@ -2,7 +2,6 @@
 
 import io.github.randomcodespace.iq.detector.DetectorContext;
 import io.github.randomcodespace.iq.detector.DetectorTestUtils;
-import io.github.randomcodespace.iq.model.NodeKind;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/io/github/randomcodespace/iq/detector/typescript/ExpressRouteDetectorExtendedTest.java b/src/test/java/io/github/randomcodespace/iq/detector/typescript/ExpressRouteDetectorExtendedTest.java
index 9c92afdc..4fd1b28d 100644
--- a/src/test/java/io/github/randomcodespace/iq/detector/typescript/ExpressRouteDetectorExtendedTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/detector/typescript/ExpressRouteDetectorExtendedTest.java
@@ -3,7 +3,6 @@
 import io.github.randomcodespace.iq.detector.DetectorContext;
 import io.github.randomcodespace.iq.detector.DetectorResult;
 import io.github.randomcodespace.iq.detector.DetectorTestUtils;
-import io.github.randomcodespace.iq.model.NodeKind;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/io/github/randomcodespace/iq/detector/typescript/TypeScriptDetectorsExtendedTest.java b/src/test/java/io/github/randomcodespace/iq/detector/typescript/TypeScriptDetectorsExtendedTest.java
index 0c9a5753..8153e2cd 100644
--- a/src/test/java/io/github/randomcodespace/iq/detector/typescript/TypeScriptDetectorsExtendedTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/detector/typescript/TypeScriptDetectorsExtendedTest.java
@@ -2,7 +2,6 @@
 
 import io.github.randomcodespace.iq.detector.DetectorContext;
 import io.github.randomcodespace.iq.detector.DetectorTestUtils;
-import io.github.randomcodespace.iq.model.NodeKind;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/io/github/randomcodespace/iq/e2e/E2EQualityTest.java b/src/test/java/io/github/randomcodespace/iq/e2e/E2EQualityTest.java
index 2d4c0fad..11bbb230 100644
--- a/src/test/java/io/github/randomcodespace/iq/e2e/E2EQualityTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/e2e/E2EQualityTest.java
@@ -180,7 +180,6 @@ private Set<String> nodeLabelsCaseInsensitive(NodeKind kind) {
 
     // ── Setup ─────────────────────────────────────────────────────────────
 
-    @SuppressWarnings("unchecked")
     private static List<Detector> allDetectors() {
         Detector[] detectors = {
                 // Auth
diff --git a/src/test/java/io/github/randomcodespace/iq/graph/GraphStoreExtendedTest.java b/src/test/java/io/github/randomcodespace/iq/graph/GraphStoreExtendedTest.java
index f11e6b44..6a9181e9 100644
--- a/src/test/java/io/github/randomcodespace/iq/graph/GraphStoreExtendedTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/graph/GraphStoreExtendedTest.java
@@ -70,18 +70,6 @@ private Transaction mockNodeResult(String id, String kind, String label, String
         return tx;
     }
 
-    /**
-     * Sets up graphDb to return an empty result (no rows).
-     */
-    private void mockEmptyResult(String column) {
-        var tx = mock(Transaction.class);
-        when(graphDb.beginTx()).thenReturn(tx);
-        var result = mock(Result.class);
-        when(result.hasNext()).thenReturn(false);
-        when(result.columns()).thenReturn(List.of(column));
-        when(tx.execute(anyString(), anyMap())).thenReturn(result);
-    }
-
     // --- Write operations (still use repository) ---
 
     @Test
diff --git a/src/test/java/io/github/randomcodespace/iq/graph/GraphStoreTest.java b/src/test/java/io/github/randomcodespace/iq/graph/GraphStoreTest.java
index 3c4047f1..ccd80793 100644
--- a/src/test/java/io/github/randomcodespace/iq/graph/GraphStoreTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/graph/GraphStoreTest.java
@@ -15,7 +15,6 @@
 
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.*;
@@ -72,18 +71,6 @@ private Transaction mockNodeResult(String id, String kind, String label, String
         return tx;
     }
 
-    /**
-     * Sets up graphDb to return an empty result.
-     */
-    private void mockEmptyResult() {
-        var tx = mock(Transaction.class);
-        when(graphDb.beginTx()).thenReturn(tx);
-        var result = mock(Result.class);
-        when(result.hasNext()).thenReturn(false);
-        when(result.columns()).thenReturn(List.of("n"));
-        when(tx.execute(anyString(), anyMap())).thenReturn(result);
-    }
-
     // --- Write operations (still use repository) ---
 
     @Test
diff --git a/src/test/java/io/github/randomcodespace/iq/graph/GraphStoreTopologyAndStatsTest.java b/src/test/java/io/github/randomcodespace/iq/graph/GraphStoreTopologyAndStatsTest.java
index 0149b84f..5bfb4a5e 100644
--- a/src/test/java/io/github/randomcodespace/iq/graph/GraphStoreTopologyAndStatsTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/graph/GraphStoreTopologyAndStatsTest.java
@@ -634,11 +634,8 @@ void getTopologyShouldReturnEmptyListsForEmptyGraph() {
 
         Map<String, Object> topology = store.getTopology();
 
-        @SuppressWarnings("unchecked")
         List<?> services = (List<?>) topology.get("services");
-        @SuppressWarnings("unchecked")
         List<?> infrastructure = (List<?>) topology.get("infrastructure");
-        @SuppressWarnings("unchecked")
         List<?> connections = (List<?>) topology.get("connections");
 
         assertTrue(services.isEmpty());
diff --git a/src/test/java/io/github/randomcodespace/iq/intelligence/evidence/EvidencePackAssemblerExtendedTest.java b/src/test/java/io/github/randomcodespace/iq/intelligence/evidence/EvidencePackAssemblerExtendedTest.java
index 3579c81e..c899adba 100644
--- a/src/test/java/io/github/randomcodespace/iq/intelligence/evidence/EvidencePackAssemblerExtendedTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/intelligence/evidence/EvidencePackAssemblerExtendedTest.java
@@ -3,7 +3,6 @@
 import io.github.randomcodespace.iq.config.CodeIqConfig;
 import io.github.randomcodespace.iq.graph.GraphStore;
 import io.github.randomcodespace.iq.intelligence.CapabilityLevel;
-import io.github.randomcodespace.iq.intelligence.Provenance;
 import io.github.randomcodespace.iq.intelligence.lexical.CodeSnippet;
 import io.github.randomcodespace.iq.intelligence.lexical.LexicalQueryService;
 import io.github.randomcodespace.iq.intelligence.lexical.LexicalResult;
@@ -19,7 +18,6 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 
 import java.time.Instant;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
diff --git a/src/test/java/io/github/randomcodespace/iq/intelligence/extractor/java/JavaLanguageExtractorTest.java b/src/test/java/io/github/randomcodespace/iq/intelligence/extractor/java/JavaLanguageExtractorTest.java
index 10aaa9ce..352f3e9a 100644
--- a/src/test/java/io/github/randomcodespace/iq/intelligence/extractor/java/JavaLanguageExtractorTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/intelligence/extractor/java/JavaLanguageExtractorTest.java
@@ -3,7 +3,6 @@
 import io.github.randomcodespace.iq.detector.DetectorContext;
 import io.github.randomcodespace.iq.intelligence.CapabilityLevel;
 import io.github.randomcodespace.iq.intelligence.extractor.LanguageExtractionResult;
-import io.github.randomcodespace.iq.model.CodeEdge;
 import io.github.randomcodespace.iq.model.CodeNode;
 import io.github.randomcodespace.iq.model.EdgeKind;
 import io.github.randomcodespace.iq.model.NodeKind;
diff --git a/src/test/java/io/github/randomcodespace/iq/mcp/McpToolsTest.java b/src/test/java/io/github/randomcodespace/iq/mcp/McpToolsTest.java
index 069b7316..11fb6971 100644
--- a/src/test/java/io/github/randomcodespace/iq/mcp/McpToolsTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/mcp/McpToolsTest.java
@@ -5,8 +5,6 @@
 import io.github.randomcodespace.iq.config.CodeIqConfig;
 import io.github.randomcodespace.iq.flow.FlowEngine;
 import io.github.randomcodespace.iq.flow.FlowModels.FlowDiagram;
-import io.github.randomcodespace.iq.flow.FlowModels.FlowEdge;
-import io.github.randomcodespace.iq.flow.FlowModels.FlowNode;
 import io.github.randomcodespace.iq.flow.FlowModels.FlowSubgraph;
 import io.github.randomcodespace.iq.query.QueryService;
 import io.github.randomcodespace.iq.query.StatsService;
@@ -23,14 +21,11 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.time.Duration;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.*;
 import io.github.randomcodespace.iq.config.CodeIqConfigTestSupport;
@@ -69,10 +64,6 @@ private Map<String, Object> parseJson(String json) throws IOException {
         return objectMapper.readValue(json, new TypeReference<>() {});
     }
 
-    private List<Object> parseJsonArray(String json) throws IOException {
-        return objectMapper.readValue(json, new TypeReference<>() {});
-    }
-
     // --- get_stats ---
 
     @Test
diff --git a/src/test/java/io/github/randomcodespace/iq/model/CodeNodeEdgeExtendedTest.java b/src/test/java/io/github/randomcodespace/iq/model/CodeNodeEdgeExtendedTest.java
index ead0f4d9..8348f11f 100644
--- a/src/test/java/io/github/randomcodespace/iq/model/CodeNodeEdgeExtendedTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/model/CodeNodeEdgeExtendedTest.java
@@ -2,7 +2,6 @@
 
 import org.junit.jupiter.api.Test;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
diff --git a/src/test/java/io/github/randomcodespace/iq/query/QueryServiceTest.java b/src/test/java/io/github/randomcodespace/iq/query/QueryServiceTest.java
index b68aa9fb..cd5c6f8f 100644
--- a/src/test/java/io/github/randomcodespace/iq/query/QueryServiceTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/query/QueryServiceTest.java
@@ -488,14 +488,8 @@ void findDeadCodeShouldExcludeEntryPointKinds() {
 
     @Test
     void findDeadCodeShouldNotFlagMessageDrivenComponents() {
-        var guard = makeNode("guard:AuthGuard", NodeKind.GUARD, "AuthGuard");
-        var middleware = makeNode("mid:LoggingMiddleware", NodeKind.MIDDLEWARE, "LoggingMiddleware");
-        var topic = makeNode("topic:UserEvents", NodeKind.TOPIC, "UserEvents");
-        var queue = makeNode("queue:EmailQueue", NodeKind.QUEUE, "EmailQueue");
-        var event = makeNode("event:OrderPlaced", NodeKind.EVENT, "OrderPlaced");
-        var messageQueue = makeNode("mq:NotificationQueue", NodeKind.MESSAGE_QUEUE, "NotificationQueue");
-
-        // These are excluded via ENTRY_POINT_KINDS so graphStore won't return them
+        // These kinds (GUARD, MIDDLEWARE, TOPIC, QUEUE, EVENT, MESSAGE_QUEUE) are excluded via
+        // ENTRY_POINT_KINDS so graphStore won't return them when querying for dead code.
         when(graphStore.findNodesWithoutIncomingSemantic(anyList(), anyList(), anyList(), eq(0), eq(100)))
                 .thenReturn(List.of());