diff --git a/integraal/integraal-explanation/src/main/java/fr/boreal/explanation/explainers/FactSupportExplainer.java b/integraal/integraal-explanation/src/main/java/fr/boreal/explanation/explainers/FactSupportExplainer.java
deleted file mode 100644
index 838f63478a2ccabce2563346390efba51fb495b9..0000000000000000000000000000000000000000
--- a/integraal/integraal-explanation/src/main/java/fr/boreal/explanation/explainers/FactSupportExplainer.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package fr.boreal.explanation.explainers;
-
-import fr.boreal.explanation.api.AtomicQueryExplanationEnumerator;
-import fr.boreal.explanation.ruleFactories.StaticGRIRuleTransformer;
-import fr.boreal.explanation.solving_enumerating.gmus_processors.FactSupportGMUSProcessor;
-import fr.boreal.model.kb.api.KnowledgeBase;
-
-/**
- * Computes kb-support explanations for a knowledge base and a ground atomic query
- */
-public class FactSupportExplainer extends AbstractStaticGRIBasedExplainer implements AtomicQueryExplanationEnumerator<KnowledgeBase> {
-    KnowledgeBase gri;
-    StaticGRIRuleTransformer ruleTransformer;
-    /**
-     * Sets the initial KB and compute the GRI
-     *
-     * @param kb the current kb
-     */
-    public FactSupportExplainer(KnowledgeBase kb) {
-        super(kb);
-    }
-
-    @Override
-    FactSupportGMUSProcessor getGMUSProcessor() {
-        return new FactSupportGMUSProcessor();
-    }
-
-}
diff --git a/integraal/integraal-explanation/src/main/java/fr/boreal/explanation/ruleFactories/RuleTransformationRecord.java b/integraal/integraal-explanation/src/main/java/fr/boreal/explanation/ruleFactories/RuleTransformationRecord.java
deleted file mode 100644
index ef6539db651bcedea93a0422f49b635993651757..0000000000000000000000000000000000000000
--- a/integraal/integraal-explanation/src/main/java/fr/boreal/explanation/ruleFactories/RuleTransformationRecord.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package fr.boreal.explanation.ruleFactories;
-
-import fr.boreal.model.kb.api.RuleBase;
-import fr.boreal.model.kb.impl.RuleBaseImpl;
-import fr.boreal.model.rule.api.FORule;
-import fr.boreal.model.rule.api.Rule;
-
-import java.util.Collection;
-import java.util.LinkedHashSet;
-
-public record RuleTransformationRecord(Collection<FORule> nodeBuildingRules, Collection<FORule> edgeBuildingRules,
-                                       Collection<FORule> relTracingRules){
-
-    public RuleBase getStaticRuleBase() {
-        Collection<FORule> temp = new LinkedHashSet<>();
-        temp.addAll(this.nodeBuildingRules);
-        temp.addAll(this.edgeBuildingRules);
-        return new RuleBaseImpl(temp);
-    }
-
-    public RuleBase getDynamicRuleBase() {
-        Collection<FORule> temp = new LinkedHashSet<>();
-        temp.addAll(this.relTracingRules);
-        return new RuleBaseImpl(temp);
-    }
-
-}
diff --git a/integraal/integraal-explanation/src/test/java/fr/boreal/test/explanation/chasingAndTracing/ChaseStaticGRIRuleTransformerTest.java b/integraal/integraal-explanation/src/test/java/fr/boreal/test/explanation/chasingAndTracing/ChaseStaticGRIRuleTransformerTest.java
index a39147065de79de77c1cc976db7dcad7530cb055..fcc131c31353e4b9c2c5923b5e698fb679d1a7a7 100644
--- a/integraal/integraal-explanation/src/test/java/fr/boreal/test/explanation/chasingAndTracing/ChaseStaticGRIRuleTransformerTest.java
+++ b/integraal/integraal-explanation/src/test/java/fr/boreal/test/explanation/chasingAndTracing/ChaseStaticGRIRuleTransformerTest.java
@@ -133,7 +133,7 @@ public class ChaseStaticGRIRuleTransformerTest {
         RuleBase ruleBase = new RuleBaseImpl(List.of(TestData.r1,TestData.r9));
         KnowledgeBase kb = new KnowledgeBaseImpl(factBase, ruleBase);
 
-        KnowledgeBase transformedKB = new KnowledgeBaseImpl(factBase, factory.createTransformedRB(kb));
+        KnowledgeBase transformedKB = new KnowledgeBaseImpl(factBase, factory.createTransformedRB(kb).getAllRules());
         TestData.chase(transformedKB);
 
 //        System.out.println(transformedKB.getFactBase());
diff --git a/integraal/integraal-explanation/src/test/java/fr/boreal/test/explanation/chasingAndTracing/RELTracerTest.java b/integraal/integraal-explanation/src/test/java/fr/boreal/test/explanation/chasingAndTracing/RELTracerTest.java
index ccaf2dba45a1a6ecf9b5b2eb80407f87b1941c4d..9b1c148d7f3899f83be7e3531279312b1c6a152e 100644
--- a/integraal/integraal-explanation/src/test/java/fr/boreal/test/explanation/chasingAndTracing/RELTracerTest.java
+++ b/integraal/integraal-explanation/src/test/java/fr/boreal/test/explanation/chasingAndTracing/RELTracerTest.java
@@ -170,7 +170,7 @@ public class RELTracerTest {
         StaticGRIRuleTransformer ruleTransformerFactory = pair.getRight();
 
         RELTracer tracer = new RELTracer();
-        FactBase filteredGRI = tracer.computeQueryRelevant(gri, ruleTransformerFactory, query);
+        FactBase filteredGRI = tracer.computeQueryRelevant(gri, query);
 
         StoredFunctionalTerm fpa = ruleTransformerFactory.createFnTermIdentifier(TestData.pa);
         Atom RELpa = new AtomImpl(ruleTransformerFactory.REL, fpa);
diff --git a/integraal/integraal-explanation/src/test/java/fr/boreal/test/explanation/explainer/KBSupportExplainerTest.java b/integraal/integraal-explanation/src/test/java/fr/boreal/test/explanation/explainer/KBSupportExplainerTest.java
index ef665229dd4796cafa70a9fe822ed13199bd6eb3..88109344e19c895eb85dba70d51b053af47d9415 100644
--- a/integraal/integraal-explanation/src/test/java/fr/boreal/test/explanation/explainer/KBSupportExplainerTest.java
+++ b/integraal/integraal-explanation/src/test/java/fr/boreal/test/explanation/explainer/KBSupportExplainerTest.java
@@ -36,8 +36,8 @@ public class KBSupportExplainerTest {
         RuleBase ruleBase = new RuleBaseImpl(List.of(TestData.r1,TestData.r10, TestData.r11));
         KnowledgeBase kb = new KnowledgeBaseImpl(factBase, ruleBase);
 
-        explainer = new KBSupportExplainer(kb);
-        Set<KnowledgeBase> explanations = explainer.explain(query);
+        explainer = new KBSupportExplainer_KBGRI(kb);
+        Set<KnowledgeBase> explanations = explainer.getAllExplanations(query);
 
         FactBase expectedFactBase1 = new SimpleInMemoryGraphStore(Set.of(TestData.pa));
         RuleBase expectedRuleBase1 = new RuleBaseImpl(Set.of(TestData.r1, TestData.r10));
@@ -56,8 +56,8 @@ public class KBSupportExplainerTest {
         RuleBase ruleBase = new RuleBaseImpl(List.of(TestData.r1,TestData.r10, TestData.r11));
         KnowledgeBase kb = new KnowledgeBaseImpl(factBase, ruleBase);
 
-        explainer = new KBSupportExplainer(kb);
-        Set<KnowledgeBase> explanations = explainer.explain(query);
+        explainer = new KBSupportExplainer_KBGRI(kb);
+        Set<KnowledgeBase> explanations = explainer.getAllExplanations(query);
 
         FactBase expectedFactBase1 = new SimpleInMemoryGraphStore(Set.of(TestData.pa));
         RuleBase expectedRuleBase1 = new RuleBaseImpl(Set.of(TestData.r1));