diff --git a/applications/algorithms/machinery/src/main/java/org/neo4j/gds/applications/algorithms/machinery/DefaultAlgorithmProcessingTemplate.java b/applications/algorithms/machinery/src/main/java/org/neo4j/gds/applications/algorithms/machinery/DefaultAlgorithmProcessingTemplate.java
index e685770082..809c310da7 100644
--- a/applications/algorithms/machinery/src/main/java/org/neo4j/gds/applications/algorithms/machinery/DefaultAlgorithmProcessingTemplate.java
+++ b/applications/algorithms/machinery/src/main/java/org/neo4j/gds/applications/algorithms/machinery/DefaultAlgorithmProcessingTemplate.java
@@ -106,7 +106,6 @@ public <CONFIGURATION extends AlgoBaseConfig, RESULT_TO_CALLER, RESULT_FROM_ALGO
         // inject dependencies to render results
         return resultBuilder.build(
             graphResources.graph(),
-            graphResources.graphStore(),
             configuration,
             result,
             timingsBuilder.build(),
@@ -158,7 +157,6 @@ public <CONFIGURATION extends AlgoBaseConfig, RESULT_TO_CALLER, RESULT_FROM_ALGO
         // inject dependencies to render results
         return resultBuilder.build(
             graphResources.graph(),
-            graphResources.graphStore(),
             configuration,
             result,
             timingsBuilder.build(),
diff --git a/applications/algorithms/machinery/src/main/java/org/neo4j/gds/applications/algorithms/machinery/ResultBuilder.java b/applications/algorithms/machinery/src/main/java/org/neo4j/gds/applications/algorithms/machinery/ResultBuilder.java
index f22428d4ba..586e244bfc 100644
--- a/applications/algorithms/machinery/src/main/java/org/neo4j/gds/applications/algorithms/machinery/ResultBuilder.java
+++ b/applications/algorithms/machinery/src/main/java/org/neo4j/gds/applications/algorithms/machinery/ResultBuilder.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.applications.algorithms.machinery;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 
 import java.util.Optional;
 
@@ -42,7 +41,6 @@ public interface ResultBuilder<CONFIGURATION, RESULT_FROM_ALGORITHM, RESULT_TO_C
      */
     RESULT_TO_CALLER build(
         Graph graph,
-        GraphStore graphStore,
         CONFIGURATION configuration,
         Optional<RESULT_FROM_ALGORITHM> result,
         AlgorithmProcessingTimings timings,
diff --git a/applications/algorithms/machinery/src/test/java/org/neo4j/gds/applications/algorithms/machinery/DefaultAlgorithmProcessingTemplateTest.java b/applications/algorithms/machinery/src/test/java/org/neo4j/gds/applications/algorithms/machinery/DefaultAlgorithmProcessingTemplateTest.java
index c4b868605d..fb2eb3c87a 100644
--- a/applications/algorithms/machinery/src/test/java/org/neo4j/gds/applications/algorithms/machinery/DefaultAlgorithmProcessingTemplateTest.java
+++ b/applications/algorithms/machinery/src/test/java/org/neo4j/gds/applications/algorithms/machinery/DefaultAlgorithmProcessingTemplateTest.java
@@ -157,14 +157,12 @@ void shouldProcessWriteAlgorithm() {
             @Override
             public String build(
                 Graph actualGraph,
-                GraphStore actualGraphStore,
                 ExampleConfiguration configuration,
                 Optional<ExampleResult> actualResult,
                 AlgorithmProcessingTimings timings,
                 Optional<Long> metadata
             ) {
                 assertThat(actualGraph).isEqualTo(graph);
-                assertThat(actualGraphStore).isEqualTo(graphStore);
                 assertThat(actualResult).hasValue(pathFindingResult);
 
                 assertThat(metadata.orElseThrow()).isEqualTo(42L);
@@ -268,7 +266,6 @@ <RESULT_FROM_ALGORITHM, MUTATE_OR_WRITE_METADATA> Optional<MUTATE_OR_WRITE_METAD
             @Override
             public Map<String, Long> build(
                 Graph graph,
-                GraphStore graphStore,
                 ExampleConfiguration configuration,
                 Optional<Void> unused,
                 AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/AlphaHarmonicCentralityResultBuilderForWriteMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/AlphaHarmonicCentralityResultBuilderForWriteMode.java
index e06152993e..5eff843f51 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/AlphaHarmonicCentralityResultBuilderForWriteMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/AlphaHarmonicCentralityResultBuilderForWriteMode.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.centrality;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.NodePropertiesWritten;
@@ -42,7 +41,6 @@ class AlphaHarmonicCentralityResultBuilderForWriteMode implements ResultBuilder<
     @Override
     public Stream<AlphaHarmonicWriteResult> build(
         Graph graph,
-        GraphStore graphStore,
         DeprecatedTieredHarmonicCentralityWriteConfig configuration,
         Optional<HarmonicResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/ArticulationPointsResultBuilderForWriteMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/ArticulationPointsResultBuilderForWriteMode.java
index 7e6da6591d..23c41fbe95 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/ArticulationPointsResultBuilderForWriteMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/ArticulationPointsResultBuilderForWriteMode.java
@@ -21,7 +21,6 @@
 
 import com.carrotsearch.hppc.BitSet;
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.NodePropertiesWritten;
@@ -35,7 +34,6 @@ class ArticulationPointsResultBuilderForWriteMode implements ResultBuilder<Artic
     @Override
     public Stream<ArticulationPointsWriteResult> build(
         Graph graph,
-        GraphStore graphStore,
         ArticulationPointsWriteConfig configuration,
         Optional<BitSet> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/BetaClosenessCentralityResultBuilderForWriteMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/BetaClosenessCentralityResultBuilderForWriteMode.java
index b380f77d11..7fb05ae9b0 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/BetaClosenessCentralityResultBuilderForWriteMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/BetaClosenessCentralityResultBuilderForWriteMode.java
@@ -21,7 +21,6 @@
 
 import org.neo4j.gds.algorithms.centrality.CentralityAlgorithmResult;
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.NodePropertiesWritten;
@@ -42,7 +41,6 @@ class BetaClosenessCentralityResultBuilderForWriteMode implements ResultBuilder<
     @Override
     public Stream<BetaClosenessCentralityWriteResult> build(
         Graph graph,
-        GraphStore graphStore,
         ClosenessCentralityWriteConfig configuration,
         Optional<CentralityAlgorithmResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/BetweennessCentralityResultBuilderForWriteMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/BetweennessCentralityResultBuilderForWriteMode.java
index 0549a8e2f4..454086182d 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/BetweennessCentralityResultBuilderForWriteMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/BetweennessCentralityResultBuilderForWriteMode.java
@@ -21,7 +21,6 @@
 
 import org.neo4j.gds.algorithms.centrality.CentralityAlgorithmResult;
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.NodePropertiesWritten;
@@ -42,7 +41,6 @@ class BetweennessCentralityResultBuilderForWriteMode implements ResultBuilder<Be
     @Override
     public Stream<CentralityWriteResult> build(
         Graph graph,
-        GraphStore graphStore,
         BetweennessCentralityWriteConfig configuration,
         Optional<CentralityAlgorithmResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/CelfResultBuilderForWriteMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/CelfResultBuilderForWriteMode.java
index 0012fe20c0..b216ad563c 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/CelfResultBuilderForWriteMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/CelfResultBuilderForWriteMode.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.centrality;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.NodePropertiesWritten;
@@ -34,7 +33,6 @@ class CelfResultBuilderForWriteMode implements ResultBuilder<InfluenceMaximizati
     @Override
     public Stream<CELFWriteResult> build(
         Graph graph,
-        GraphStore graphStore,
         InfluenceMaximizationWriteConfig configuration,
         Optional<CELFResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/ClosenessCentralityResultBuilderForWriteMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/ClosenessCentralityResultBuilderForWriteMode.java
index 6996b91401..f407a580fd 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/ClosenessCentralityResultBuilderForWriteMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/ClosenessCentralityResultBuilderForWriteMode.java
@@ -21,7 +21,6 @@
 
 import org.neo4j.gds.algorithms.centrality.CentralityAlgorithmResult;
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.NodePropertiesWritten;
@@ -42,7 +41,6 @@ class ClosenessCentralityResultBuilderForWriteMode implements ResultBuilder<Clos
     @Override
     public Stream<CentralityWriteResult> build(
         Graph graph,
-        GraphStore graphStore,
         ClosenessCentralityWriteConfig configuration,
         Optional<CentralityAlgorithmResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/DegreeCentralityResultBuilderForWriteMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/DegreeCentralityResultBuilderForWriteMode.java
index 097d9dfdea..4db5253b10 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/DegreeCentralityResultBuilderForWriteMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/DegreeCentralityResultBuilderForWriteMode.java
@@ -21,7 +21,6 @@
 
 import org.neo4j.gds.algorithms.centrality.CentralityAlgorithmResult;
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.NodePropertiesWritten;
@@ -42,7 +41,6 @@ class DegreeCentralityResultBuilderForWriteMode implements ResultBuilder<DegreeC
     @Override
     public Stream<CentralityWriteResult> build(
         Graph graph,
-        GraphStore graphStore,
         DegreeCentralityWriteConfig configuration,
         Optional<CentralityAlgorithmResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/HarmonicCentralityResultBuilderForWriteMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/HarmonicCentralityResultBuilderForWriteMode.java
index 1f857253a2..a7cfc81a5d 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/HarmonicCentralityResultBuilderForWriteMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/HarmonicCentralityResultBuilderForWriteMode.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.centrality;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.NodePropertiesWritten;
@@ -42,7 +41,6 @@ class HarmonicCentralityResultBuilderForWriteMode implements ResultBuilder<Harmo
     @Override
     public Stream<CentralityWriteResult> build(
         Graph graph,
-        GraphStore graphStore,
         HarmonicCentralityWriteConfig configuration,
         Optional<HarmonicResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/PageRankResultBuilderForWriteMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/PageRankResultBuilderForWriteMode.java
index d04b335b18..0b985ce2cb 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/PageRankResultBuilderForWriteMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/PageRankResultBuilderForWriteMode.java
@@ -21,7 +21,6 @@
 
 import org.neo4j.gds.algorithms.centrality.PageRankDistributionComputer;
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.NodePropertiesWritten;
@@ -41,7 +40,6 @@ class PageRankResultBuilderForWriteMode implements ResultBuilder<PageRankWriteCo
     @Override
     public Stream<PageRankWriteResult> build(
         Graph graph,
-        GraphStore graphStore,
         PageRankWriteConfig configuration,
         Optional<PageRankResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/stubs/ArticulationPointsResultBuilderForMutateMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/stubs/ArticulationPointsResultBuilderForMutateMode.java
index 5ebbd9190b..3477682dc1 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/stubs/ArticulationPointsResultBuilderForMutateMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/stubs/ArticulationPointsResultBuilderForMutateMode.java
@@ -21,7 +21,6 @@
 
 import com.carrotsearch.hppc.BitSet;
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.NodePropertiesWritten;
@@ -35,7 +34,6 @@ public class ArticulationPointsResultBuilderForMutateMode implements ResultBuild
     @Override
     public ArticulationPointsMutateResult build(
         Graph graph,
-        GraphStore graphStore,
         ArticulationPointsMutateConfig configuration,
         Optional<BitSet> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/stubs/BetaClosenessCentralityResultBuilderForMutateMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/stubs/BetaClosenessCentralityResultBuilderForMutateMode.java
index 41dc711d66..52e0544522 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/stubs/BetaClosenessCentralityResultBuilderForMutateMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/stubs/BetaClosenessCentralityResultBuilderForMutateMode.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.centrality.stubs;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.NodePropertiesWritten;
@@ -42,7 +41,6 @@ class BetaClosenessCentralityResultBuilderForMutateMode implements ResultBuilder
     @Override
     public BetaClosenessCentralityMutateResult build(
         Graph graph,
-        GraphStore graphStore,
         ClosenessCentralityMutateConfig configuration,
         Optional<ClosenessCentralityResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/stubs/BetweennessCentralityResultBuilderForMutateMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/stubs/BetweennessCentralityResultBuilderForMutateMode.java
index bc8c1b7939..a245dc2685 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/stubs/BetweennessCentralityResultBuilderForMutateMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/stubs/BetweennessCentralityResultBuilderForMutateMode.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.centrality.stubs;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.NodePropertiesWritten;
@@ -42,7 +41,6 @@ public BetweennessCentralityResultBuilderForMutateMode(boolean shouldComputeCent
     @Override
     public CentralityMutateResult build(
         Graph graph,
-        GraphStore graphStore,
         BetweennessCentralityMutateConfig configuration,
         Optional<BetwennessCentralityResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/stubs/CelfResultBuilderForMutateMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/stubs/CelfResultBuilderForMutateMode.java
index 9966cc9355..33af483253 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/stubs/CelfResultBuilderForMutateMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/stubs/CelfResultBuilderForMutateMode.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.centrality.stubs;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.NodePropertiesWritten;
@@ -34,7 +33,6 @@ public class CelfResultBuilderForMutateMode implements ResultBuilder<InfluenceMa
     @Override
     public CELFMutateResult build(
         Graph graph,
-        GraphStore graphStore,
         InfluenceMaximizationMutateConfig configuration,
         Optional<CELFResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/stubs/ClosenessCentralityResultBuilderForMutateMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/stubs/ClosenessCentralityResultBuilderForMutateMode.java
index b35b6b874e..fd6420b98b 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/stubs/ClosenessCentralityResultBuilderForMutateMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/stubs/ClosenessCentralityResultBuilderForMutateMode.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.centrality.stubs;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.NodePropertiesWritten;
@@ -42,7 +41,6 @@ public   ClosenessCentralityResultBuilderForMutateMode(boolean shouldComputeCent
     @Override
     public CentralityMutateResult build(
         Graph graph,
-        GraphStore graphStore,
         ClosenessCentralityMutateConfig configuration,
         Optional<ClosenessCentralityResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/stubs/DegreeCentralityResultBuilderForMutateMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/stubs/DegreeCentralityResultBuilderForMutateMode.java
index b30f99fabf..508e944aa7 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/stubs/DegreeCentralityResultBuilderForMutateMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/stubs/DegreeCentralityResultBuilderForMutateMode.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.centrality.stubs;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.NodePropertiesWritten;
@@ -42,7 +41,6 @@ public DegreeCentralityResultBuilderForMutateMode(boolean shouldComputeCentralit
     @Override
     public CentralityMutateResult build(
         Graph graph,
-        GraphStore graphStore,
         DegreeCentralityMutateConfig configuration,
         Optional<DegreeCentralityResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/stubs/HarmonicCentralityResultBuilderForMutateMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/stubs/HarmonicCentralityResultBuilderForMutateMode.java
index 2164916479..20956fbcd4 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/stubs/HarmonicCentralityResultBuilderForMutateMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/stubs/HarmonicCentralityResultBuilderForMutateMode.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.centrality.stubs;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.NodePropertiesWritten;
@@ -42,7 +41,6 @@ public  HarmonicCentralityResultBuilderForMutateMode(boolean shouldComputeCentra
     @Override
     public CentralityMutateResult build(
         Graph graph,
-        GraphStore graphStore,
         HarmonicCentralityMutateConfig configuration,
         Optional<HarmonicResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/stubs/PageRankResultBuilderForMutateMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/stubs/PageRankResultBuilderForMutateMode.java
index b28382dc9e..e27079f802 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/stubs/PageRankResultBuilderForMutateMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/stubs/PageRankResultBuilderForMutateMode.java
@@ -21,7 +21,6 @@
 
 import org.neo4j.gds.algorithms.centrality.PageRankDistributionComputer;
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.NodePropertiesWritten;
@@ -41,7 +40,6 @@ public PageRankResultBuilderForMutateMode(boolean shouldComputeCentralityDistrib
     @Override
     public PageRankMutateResult build(
         Graph graph,
-        GraphStore graphStore,
         PageRankMutateConfig configuration,
         Optional<PageRankResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/K1ColoringResultBuilderForWriteMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/K1ColoringResultBuilderForWriteMode.java
index 1965a07a48..54fdf140c7 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/K1ColoringResultBuilderForWriteMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/K1ColoringResultBuilderForWriteMode.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.community;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.k1coloring.K1ColoringResult;
@@ -37,7 +36,6 @@ class K1ColoringResultBuilderForWriteMode implements ResultBuilder<K1ColoringWri
     @Override
     public Stream<K1ColoringWriteResult> build(
         Graph graph,
-        GraphStore graphStore,
         K1ColoringWriteConfig configuration,
         Optional<K1ColoringResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/KCoreResultBuilderForWriteMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/KCoreResultBuilderForWriteMode.java
index 8e9eda70ad..e110a358df 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/KCoreResultBuilderForWriteMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/KCoreResultBuilderForWriteMode.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.community;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.NodePropertiesWritten;
@@ -34,7 +33,6 @@ class KCoreResultBuilderForWriteMode implements ResultBuilder<KCoreDecomposition
     @Override
     public Stream<KCoreDecompositionWriteResult> build(
         Graph graph,
-        GraphStore graphStore,
         KCoreDecompositionWriteConfig configuration,
         Optional<KCoreDecompositionResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/KMeansResultBuilderForWriteMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/KMeansResultBuilderForWriteMode.java
index d89bcdcdb5..51e1380f2d 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/KMeansResultBuilderForWriteMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/KMeansResultBuilderForWriteMode.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.community;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.api.properties.nodes.NodePropertyValuesAdapter;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
@@ -49,7 +48,6 @@ class KMeansResultBuilderForWriteMode implements ResultBuilder<KmeansWriteConfig
     @Override
     public Stream<KmeansWriteResult> build(
         Graph graph,
-        GraphStore graphStore,
         KmeansWriteConfig configuration,
         Optional<KmeansResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/LabelPropagationResultBuilderForWriteMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/LabelPropagationResultBuilderForWriteMode.java
index 6e489d3fe6..6aaa2eb535 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/LabelPropagationResultBuilderForWriteMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/LabelPropagationResultBuilderForWriteMode.java
@@ -21,7 +21,6 @@
 
 import org.apache.commons.lang3.tuple.Pair;
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.api.properties.nodes.NodePropertyValues;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
@@ -45,7 +44,6 @@ class LabelPropagationResultBuilderForWriteMode implements ResultBuilder<LabelPr
     @Override
     public Stream<LabelPropagationWriteResult> build(
         Graph graph,
-        GraphStore graphStore,
         LabelPropagationWriteConfig configuration,
         Optional<LabelPropagationResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/LccResultBuilderForWriteMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/LccResultBuilderForWriteMode.java
index 42df04a826..56fc7f193a 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/LccResultBuilderForWriteMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/LccResultBuilderForWriteMode.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.community;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.NodePropertiesWritten;
@@ -34,7 +33,6 @@ class LccResultBuilderForWriteMode implements ResultBuilder<LocalClusteringCoeff
     @Override
     public Stream<LocalClusteringCoefficientWriteResult> build(
         Graph graph,
-        GraphStore graphStore,
         LocalClusteringCoefficientWriteConfig configuration,
         Optional<LocalClusteringCoefficientResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/LeidenResultBuilderForWriteMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/LeidenResultBuilderForWriteMode.java
index aa178feb6c..c6d234a0e0 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/LeidenResultBuilderForWriteMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/LeidenResultBuilderForWriteMode.java
@@ -21,7 +21,6 @@
 
 import org.apache.commons.lang3.tuple.Pair;
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.api.properties.nodes.NodePropertyValues;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
@@ -47,7 +46,6 @@ class LeidenResultBuilderForWriteMode implements ResultBuilder<LeidenWriteConfig
     @Override
     public Stream<LeidenWriteResult> build(
         Graph graph,
-        GraphStore graphStore,
         LeidenWriteConfig configuration,
         Optional<LeidenResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/LouvainResultBuilderForWriteMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/LouvainResultBuilderForWriteMode.java
index 88cbbfc324..3dadae037f 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/LouvainResultBuilderForWriteMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/LouvainResultBuilderForWriteMode.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.community;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.community.LouvainNodePropertyValuesComputer;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
@@ -47,7 +46,6 @@ class LouvainResultBuilderForWriteMode implements ResultBuilder<LouvainWriteConf
     @Override
     public Stream<LouvainWriteResult> build(
         Graph graph,
-        GraphStore graphStore,
         LouvainWriteConfig configuration,
         Optional<LouvainResult> result,
         AlgorithmProcessingTimings timings,
@@ -57,15 +55,9 @@ public Stream<LouvainWriteResult> build(
 
         var louvainResult = result.get();
 
-        var nodePropertyValues = louvainNodePropertyValuesComputer.compute(
-            graphStore,
-            configuration,
-            configuration.writeProperty(),
-            louvainResult
-        );
 
         var communityStatistics = CommunityStatistics.communityStats(
-            nodePropertyValues.nodeCount(),
+            louvainResult.communities().size(),
             louvainResult::community,
             DefaultPool.INSTANCE,
             configuration.concurrency(),
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/ModularityOptimizationResultBuilderForWriteMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/ModularityOptimizationResultBuilderForWriteMode.java
index 86c26dd047..5e681614c2 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/ModularityOptimizationResultBuilderForWriteMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/ModularityOptimizationResultBuilderForWriteMode.java
@@ -19,9 +19,7 @@
  */
 package org.neo4j.gds.procedures.algorithms.community;
 
-import org.neo4j.gds.algorithms.community.CommunityCompanion;
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.NodePropertiesWritten;
@@ -44,7 +42,6 @@ class ModularityOptimizationResultBuilderForWriteMode implements ResultBuilder<M
     @Override
     public Stream<ModularityOptimizationWriteResult> build(
         Graph graph,
-        GraphStore graphStore,
         ModularityOptimizationWriteConfig configuration,
         Optional<ModularityOptimizationResult> result,
         AlgorithmProcessingTimings timings,
@@ -57,19 +54,8 @@ public Stream<ModularityOptimizationWriteResult> build(
 
         var modularityOptimizationResult = result.get();
 
-        var nodePropertyValues = CommunityCompanion.nodePropertyValues(
-            configuration.isIncremental(),
-            configuration.writeProperty(),
-            configuration.seedProperty(),
-            configuration.consecutiveIds(),
-            modularityOptimizationResult.asNodeProperties(),
-            configuration.minCommunitySize(),
-            configuration.concurrency(),
-            () -> graphStore.nodeProperty(configuration.seedProperty())
-        );
-
         var communityStatistics = CommunityStatistics.communityStats(
-            nodePropertyValues.nodeCount(),
+            modularityOptimizationResult.asNodeProperties().nodeCount(),
             modularityOptimizationResult::communityId,
             DefaultPool.INSTANCE,
             configuration.concurrency(),
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/SccAlphaResultBuilderForWriteMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/SccAlphaResultBuilderForWriteMode.java
index 304171f0e2..7abf020536 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/SccAlphaResultBuilderForWriteMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/SccAlphaResultBuilderForWriteMode.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.community;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.api.properties.nodes.NodePropertyValuesAdapter;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
@@ -44,7 +43,6 @@ class SccAlphaResultBuilderForWriteMode implements ResultBuilder<SccAlphaWriteCo
     @Override
     public Stream<AlphaSccWriteResult> build(
         Graph graph,
-        GraphStore graphStore,
         SccAlphaWriteConfig configuration,
         Optional<HugeLongArray> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/SccResultBuilderForWriteMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/SccResultBuilderForWriteMode.java
index 85775e0e20..609ba79f99 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/SccResultBuilderForWriteMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/SccResultBuilderForWriteMode.java
@@ -21,7 +21,6 @@
 
 import org.neo4j.gds.algorithms.community.CommunityCompanion;
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.api.properties.nodes.NodePropertyValuesAdapter;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
@@ -45,7 +44,6 @@ class SccResultBuilderForWriteMode implements ResultBuilder<SccWriteConfig, Huge
     @Override
     public Stream<SccWriteResult> build(
         Graph graph,
-        GraphStore graphStore,
         SccWriteConfig configuration,
         Optional<HugeLongArray> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/TriangleCountResultBuilderForWriteMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/TriangleCountResultBuilderForWriteMode.java
index f256882a09..c3410dfbc4 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/TriangleCountResultBuilderForWriteMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/TriangleCountResultBuilderForWriteMode.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.community;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.NodePropertiesWritten;
@@ -34,7 +33,6 @@ class TriangleCountResultBuilderForWriteMode implements ResultBuilder<TriangleCo
     @Override
     public Stream<TriangleCountWriteResult> build(
         Graph graph,
-        GraphStore graphStore,
         TriangleCountWriteConfig configuration,
         Optional<TriangleCountResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/WccResultBuilderForWriteMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/WccResultBuilderForWriteMode.java
index 70c6d3c058..3417861a09 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/WccResultBuilderForWriteMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/WccResultBuilderForWriteMode.java
@@ -21,7 +21,6 @@
 
 import org.apache.commons.lang3.tuple.Pair;
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.api.properties.nodes.NodePropertyValues;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
@@ -45,7 +44,6 @@ class WccResultBuilderForWriteMode implements ResultBuilder<WccWriteConfig, Disj
     @Override
     public Stream<WccWriteResult> build(
         Graph graph,
-        GraphStore graphStore,
         WccWriteConfig configuration,
         Optional<DisjointSetStruct> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/stubs/ApproxMaxKCutResultBuilderForMutateMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/stubs/ApproxMaxKCutResultBuilderForMutateMode.java
index ff2602c178..2cb1d8c874 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/stubs/ApproxMaxKCutResultBuilderForMutateMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/stubs/ApproxMaxKCutResultBuilderForMutateMode.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.community.stubs;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.NodePropertiesWritten;
@@ -34,7 +33,6 @@ public class ApproxMaxKCutResultBuilderForMutateMode implements ResultBuilder<Ap
     @Override
     public ApproxMaxKCutMutateResult build(
         Graph graph,
-        GraphStore graphStore,
         ApproxMaxKCutMutateConfig configuration,
         Optional<ApproxMaxKCutResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/stubs/K1ColoringResultBuilderForMutateMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/stubs/K1ColoringResultBuilderForMutateMode.java
index 00b1d7cea1..8efe929b1c 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/stubs/K1ColoringResultBuilderForMutateMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/stubs/K1ColoringResultBuilderForMutateMode.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.community.stubs;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.k1coloring.K1ColoringMutateConfig;
@@ -39,7 +38,6 @@ public K1ColoringResultBuilderForMutateMode(boolean computeUsedColors) {
     @Override
     public K1ColoringMutateResult build(
         Graph graph,
-        GraphStore graphStore,
         K1ColoringMutateConfig configuration,
         Optional<K1ColoringResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/stubs/KCoreResultBuilderForMutateMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/stubs/KCoreResultBuilderForMutateMode.java
index ea1b6cb33e..8787b9cad8 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/stubs/KCoreResultBuilderForMutateMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/stubs/KCoreResultBuilderForMutateMode.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.community.stubs;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.NodePropertiesWritten;
@@ -34,7 +33,6 @@ public class KCoreResultBuilderForMutateMode implements ResultBuilder<KCoreDecom
     @Override
     public KCoreDecompositionMutateResult build(
         Graph graph,
-        GraphStore graphStore,
         KCoreDecompositionMutateConfig configuration,
         Optional<KCoreDecompositionResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/stubs/KMeansResultBuilderForMutateMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/stubs/KMeansResultBuilderForMutateMode.java
index 29d0406013..10d9bad97c 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/stubs/KMeansResultBuilderForMutateMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/stubs/KMeansResultBuilderForMutateMode.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.community.stubs;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.api.properties.nodes.NodePropertyValuesAdapter;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
@@ -51,7 +50,6 @@ public KMeansResultBuilderForMutateMode(
     @Override
     public KmeansMutateResult build(
         Graph graph,
-        GraphStore graphStore,
         KmeansMutateConfig configuration,
         Optional<KmeansResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/stubs/LabelPropagationResultBuilderForMutateMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/stubs/LabelPropagationResultBuilderForMutateMode.java
index 37e4dd3bee..09362e326e 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/stubs/LabelPropagationResultBuilderForMutateMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/stubs/LabelPropagationResultBuilderForMutateMode.java
@@ -19,10 +19,7 @@
  */
 package org.neo4j.gds.procedures.algorithms.community.stubs;
 
-import org.neo4j.gds.algorithms.community.CommunityCompanion;
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
-import org.neo4j.gds.api.properties.nodes.NodePropertyValuesAdapter;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.NodePropertiesWritten;
@@ -46,7 +43,6 @@ public LabelPropagationResultBuilderForMutateMode(StatisticsComputationInstructi
     @Override
     public LabelPropagationMutateResult build(
         Graph graph,
-        GraphStore graphStore,
         LabelPropagationMutateConfig configuration,
         Optional<LabelPropagationResult> result,
         AlgorithmProcessingTimings timings,
@@ -56,19 +52,12 @@ public LabelPropagationMutateResult build(
 
         var labelPropagationResult = result.get();
 
-        var nodePropertyValues = CommunityCompanion.nodePropertyValues(
-            configuration.isIncremental(),
-            configuration.mutateProperty(),
-            configuration.seedProperty(),
-            configuration.consecutiveIds(),
-            NodePropertyValuesAdapter.adapt(labelPropagationResult.labels()),
-            () -> graphStore.nodeProperty(configuration.seedProperty())
-        );
+
 
         var communityStatisticsWithTiming = communityStatisticsWithTimingComputer.compute(
             configuration,
             statisticsComputationInstructions,
-            nodePropertyValues.nodeCount(),
+            labelPropagationResult.labels().size(),
             labelPropagationResult.labels()::get
         );
 
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/stubs/LccResultBuilderForMutateMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/stubs/LccResultBuilderForMutateMode.java
index 838487fd1d..25ed9d204e 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/stubs/LccResultBuilderForMutateMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/stubs/LccResultBuilderForMutateMode.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.community.stubs;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.NodePropertiesWritten;
@@ -34,7 +33,6 @@ public class LccResultBuilderForMutateMode implements ResultBuilder<LocalCluster
     @Override
     public LocalClusteringCoefficientMutateResult build(
         Graph graph,
-        GraphStore graphStore,
         LocalClusteringCoefficientMutateConfig configuration,
         Optional<LocalClusteringCoefficientResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/stubs/LeidenResultBuilderForMutateMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/stubs/LeidenResultBuilderForMutateMode.java
index d2dda1d0a3..4112c84903 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/stubs/LeidenResultBuilderForMutateMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/stubs/LeidenResultBuilderForMutateMode.java
@@ -21,7 +21,6 @@
 
 import org.apache.commons.lang3.tuple.Pair;
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.api.properties.nodes.NodePropertyValues;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
@@ -48,7 +47,6 @@ public LeidenResultBuilderForMutateMode(StatisticsComputationInstructions statis
     @Override
     public LeidenMutateResult build(
         Graph graph,
-        GraphStore graphStore,
         LeidenMutateConfig configuration,
         Optional<LeidenResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/stubs/LouvainResultBuilderForMutateMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/stubs/LouvainResultBuilderForMutateMode.java
index f0f1e02670..344086bef5 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/stubs/LouvainResultBuilderForMutateMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/stubs/LouvainResultBuilderForMutateMode.java
@@ -20,8 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.community.stubs;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
-import org.neo4j.gds.applications.algorithms.community.LouvainNodePropertyValuesComputer;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.NodePropertiesWritten;
@@ -45,7 +43,6 @@ public LouvainResultBuilderForMutateMode(StatisticsComputationInstructions stati
     @Override
     public LouvainMutateResult build(
         Graph graph,
-        GraphStore graphStore,
         LouvainMutateConfig configuration,
         Optional<LouvainResult> result,
         AlgorithmProcessingTimings timings,
@@ -55,17 +52,12 @@ public LouvainMutateResult build(
 
         var louvainResult = result.get();
 
-        var nodePropertyValues = new LouvainNodePropertyValuesComputer().compute(
-            graphStore,
-            configuration,
-            configuration.mutateProperty(),
-            louvainResult
-        );
+
 
         var communityStatisticsWithTiming = communityStatisticsWithTimingComputer.compute(
             configuration,
             statisticsComputationInstructions,
-            nodePropertyValues.nodeCount(),
+            louvainResult.communities().size(),
             louvainResult::community
         );
 
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/stubs/ModularityOptimizationResultBuilderForMutateMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/stubs/ModularityOptimizationResultBuilderForMutateMode.java
index 6a8641ffb9..9f15eea12f 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/stubs/ModularityOptimizationResultBuilderForMutateMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/stubs/ModularityOptimizationResultBuilderForMutateMode.java
@@ -19,9 +19,7 @@
  */
 package org.neo4j.gds.procedures.algorithms.community.stubs;
 
-import org.neo4j.gds.algorithms.community.CommunityCompanion;
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.NodePropertiesWritten;
@@ -45,7 +43,6 @@ public ModularityOptimizationResultBuilderForMutateMode(StatisticsComputationIns
     @Override
     public ModularityOptimizationMutateResult build(
         Graph graph,
-        GraphStore graphStore,
         ModularityOptimizationMutateConfig configuration,
         Optional<ModularityOptimizationResult> result,
         AlgorithmProcessingTimings timings,
@@ -55,19 +52,12 @@ public ModularityOptimizationMutateResult build(
 
         var modularityOptimizationResult = result.get();
 
-        var nodePropertyValues = CommunityCompanion.nodePropertyValues(
-            configuration.isIncremental(),
-            configuration.mutateProperty(),
-            configuration.seedProperty(),
-            configuration.consecutiveIds(),
-            modularityOptimizationResult.asNodeProperties(),
-            () -> graphStore.nodeProperty(configuration.seedProperty())
-        );
+      var nodeCount= modularityOptimizationResult.asNodeProperties().nodeCount();
 
         var communityStatisticsWithTiming = communityStatisticsWithTimingComputer.compute(
             configuration,
             statisticsComputationInstructions,
-            nodePropertyValues.nodeCount(),
+            nodeCount,
             modularityOptimizationResult::communityId
         );
 
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/stubs/SccResultBuilderForMutateMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/stubs/SccResultBuilderForMutateMode.java
index cd79cd6c6c..269f3de26a 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/stubs/SccResultBuilderForMutateMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/stubs/SccResultBuilderForMutateMode.java
@@ -21,7 +21,6 @@
 
 import org.neo4j.gds.algorithms.community.CommunityCompanion;
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.api.properties.nodes.NodePropertyValuesAdapter;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
@@ -46,7 +45,6 @@ public SccResultBuilderForMutateMode(StatisticsComputationInstructions statistic
     @Override
     public SccMutateResult build(
         Graph graph,
-        GraphStore graphStore,
         SccMutateConfig configuration,
         Optional<HugeLongArray> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/stubs/TriangleCountResultBuilderForMutateMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/stubs/TriangleCountResultBuilderForMutateMode.java
index 5d6d3b5553..7c16518556 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/stubs/TriangleCountResultBuilderForMutateMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/stubs/TriangleCountResultBuilderForMutateMode.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.community.stubs;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.NodePropertiesWritten;
@@ -34,7 +33,6 @@ public class TriangleCountResultBuilderForMutateMode implements ResultBuilder<Tr
     @Override
     public TriangleCountMutateResult build(
         Graph graph,
-        GraphStore graphStore,
         TriangleCountMutateConfig configuration,
         Optional<TriangleCountResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/stubs/WccResultBuilderForMutateMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/stubs/WccResultBuilderForMutateMode.java
index cf46baf444..929adaaeeb 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/stubs/WccResultBuilderForMutateMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/community/stubs/WccResultBuilderForMutateMode.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.community.stubs;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.NodePropertiesWritten;
@@ -44,7 +43,6 @@ public WccResultBuilderForMutateMode(StatisticsComputationInstructions statistic
     @Override
     public WccMutateResult build(
         Graph graph,
-        GraphStore graphStore,
         WccMutateConfig configuration,
         Optional<DisjointSetStruct> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/embeddings/FastRPResultBuilderForWriteMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/embeddings/FastRPResultBuilderForWriteMode.java
index 6dcb65c817..f7ed2c355c 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/embeddings/FastRPResultBuilderForWriteMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/embeddings/FastRPResultBuilderForWriteMode.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.embeddings;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.NodePropertiesWritten;
@@ -34,7 +33,6 @@ class FastRPResultBuilderForWriteMode implements ResultBuilder<FastRPWriteConfig
     @Override
     public Stream<DefaultNodeEmbeddingsWriteResult> build(
         Graph graph,
-        GraphStore graphStore,
         FastRPWriteConfig configuration,
         Optional<FastRPResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/embeddings/GraphSageResultBuilderForTrainMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/embeddings/GraphSageResultBuilderForTrainMode.java
index b396b8f7df..cd240e90b7 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/embeddings/GraphSageResultBuilderForTrainMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/embeddings/GraphSageResultBuilderForTrainMode.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.embeddings;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.core.model.Model;
@@ -35,7 +34,6 @@ class GraphSageResultBuilderForTrainMode implements ResultBuilder<GraphSageTrain
     @Override
     public Stream<GraphSageTrainResult> build(
         Graph graph,
-        GraphStore graphStore,
         GraphSageTrainConfig configuration,
         Optional<Model<ModelData, GraphSageTrainConfig, GraphSageModelTrainer.GraphSageTrainMetrics>> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/embeddings/GraphSageResultBuilderForWriteMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/embeddings/GraphSageResultBuilderForWriteMode.java
index 8d71010024..8aca9501a3 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/embeddings/GraphSageResultBuilderForWriteMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/embeddings/GraphSageResultBuilderForWriteMode.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.embeddings;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.NodePropertiesWritten;
@@ -34,7 +33,6 @@ class GraphSageResultBuilderForWriteMode implements ResultBuilder<GraphSageWrite
     @Override
     public Stream<DefaultNodeEmbeddingsWriteResult> build(
         Graph graph,
-        GraphStore graphStore,
         GraphSageWriteConfig configuration,
         Optional<GraphSageResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/embeddings/Node2VecResultBuilderForWriteMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/embeddings/Node2VecResultBuilderForWriteMode.java
index 71b9677a4b..704a13c8d5 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/embeddings/Node2VecResultBuilderForWriteMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/embeddings/Node2VecResultBuilderForWriteMode.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.embeddings;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.NodePropertiesWritten;
@@ -34,7 +33,6 @@ class Node2VecResultBuilderForWriteMode implements ResultBuilder<Node2VecWriteCo
     @Override
     public Stream<Node2VecWriteResult> build(
         Graph graph,
-        GraphStore graphStore,
         Node2VecWriteConfig configuration,
         Optional<Node2VecResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/embeddings/stubs/FastRPResultBuilderForMutateMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/embeddings/stubs/FastRPResultBuilderForMutateMode.java
index 648cf9853b..03c5d0c200 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/embeddings/stubs/FastRPResultBuilderForMutateMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/embeddings/stubs/FastRPResultBuilderForMutateMode.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.embeddings.stubs;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.NodePropertiesWritten;
@@ -34,7 +33,6 @@ public class FastRPResultBuilderForMutateMode implements ResultBuilder<FastRPMut
     @Override
     public DefaultNodeEmbeddingMutateResult build(
         Graph graph,
-        GraphStore graphStore,
         FastRPMutateConfig configuration,
         Optional<FastRPResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/embeddings/stubs/GraphSageResultBuilderForMutateMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/embeddings/stubs/GraphSageResultBuilderForMutateMode.java
index a475578688..5804bca9da 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/embeddings/stubs/GraphSageResultBuilderForMutateMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/embeddings/stubs/GraphSageResultBuilderForMutateMode.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.embeddings.stubs;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.NodePropertiesWritten;
@@ -34,7 +33,6 @@ class GraphSageResultBuilderForMutateMode implements ResultBuilder<GraphSageMuta
     @Override
     public DefaultNodeEmbeddingMutateResult build(
         Graph graph,
-        GraphStore graphStore,
         GraphSageMutateConfig configuration,
         Optional<GraphSageResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/embeddings/stubs/HashGnnResultBuilderForMutateMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/embeddings/stubs/HashGnnResultBuilderForMutateMode.java
index 169ca1c80b..033cb7a925 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/embeddings/stubs/HashGnnResultBuilderForMutateMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/embeddings/stubs/HashGnnResultBuilderForMutateMode.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.embeddings.stubs;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.NodePropertiesWritten;
@@ -34,7 +33,6 @@ public class HashGnnResultBuilderForMutateMode implements ResultBuilder<HashGNNM
     @Override
     public DefaultNodeEmbeddingMutateResult build(
         Graph graph,
-        GraphStore graphStore,
         HashGNNMutateConfig configuration,
         Optional<HashGNNResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/embeddings/stubs/Node2VecResultBuilderForMutateMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/embeddings/stubs/Node2VecResultBuilderForMutateMode.java
index a132297548..4725462ec8 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/embeddings/stubs/Node2VecResultBuilderForMutateMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/embeddings/stubs/Node2VecResultBuilderForMutateMode.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.embeddings.stubs;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.NodePropertiesWritten;
@@ -34,7 +33,6 @@ public class Node2VecResultBuilderForMutateMode implements ResultBuilder<Node2Ve
     @Override
     public Node2VecMutateResult build(
         Graph graph,
-        GraphStore graphStore,
         Node2VecMutateConfig configuration,
         Optional<Node2VecResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/machinelearning/KgeResultBuilderForWriteMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/machinelearning/KgeResultBuilderForWriteMode.java
index bbcbe937a1..268b96eed8 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/machinelearning/KgeResultBuilderForWriteMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/machinelearning/KgeResultBuilderForWriteMode.java
@@ -22,7 +22,6 @@
 import org.neo4j.gds.algorithms.machinelearning.KGEPredictResult;
 import org.neo4j.gds.algorithms.machinelearning.KGEPredictWriteConfig;
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.RelationshipsWritten;
@@ -34,7 +33,6 @@ class KgeResultBuilderForWriteMode implements ResultBuilder<KGEPredictWriteConfi
     @Override
     public Stream<KGEWriteResult> build(
         Graph graph,
-        GraphStore graphStore,
         KGEPredictWriteConfig configuration,
         Optional<KGEPredictResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/machinelearning/stubs/KgeResultBuilderForMutateMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/machinelearning/stubs/KgeResultBuilderForMutateMode.java
index 281ec91bee..bbe725d605 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/machinelearning/stubs/KgeResultBuilderForMutateMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/machinelearning/stubs/KgeResultBuilderForMutateMode.java
@@ -22,7 +22,6 @@
 import org.neo4j.gds.algorithms.machinelearning.KGEPredictMutateConfig;
 import org.neo4j.gds.algorithms.machinelearning.KGEPredictResult;
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.RelationshipsWritten;
@@ -34,7 +33,6 @@ class KgeResultBuilderForMutateMode implements ResultBuilder<KGEPredictMutateCon
     @Override
     public KGEMutateResult build(
         Graph graph,
-        GraphStore graphStore,
         KGEPredictMutateConfig configuration,
         Optional<KGEPredictResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/machinelearning/stubs/SplitRelationshipsResultBuilderForMutateMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/machinelearning/stubs/SplitRelationshipsResultBuilderForMutateMode.java
index 152b4993b9..5756ba7559 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/machinelearning/stubs/SplitRelationshipsResultBuilderForMutateMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/machinelearning/stubs/SplitRelationshipsResultBuilderForMutateMode.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.machinelearning.stubs;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.RelationshipsWritten;
@@ -34,7 +33,6 @@ class SplitRelationshipsResultBuilderForMutateMode implements ResultBuilder<Spli
     @Override
     public SplitRelationshipsMutateResult build(
         Graph graph,
-        GraphStore graphStore,
         SplitRelationshipsMutateConfig configuration,
         Optional<EdgeSplitter.SplitResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/miscellaneous/ScalePropertiesResultBuilderForWriteMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/miscellaneous/ScalePropertiesResultBuilderForWriteMode.java
index 2ed66863c5..4b706b4c4c 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/miscellaneous/ScalePropertiesResultBuilderForWriteMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/miscellaneous/ScalePropertiesResultBuilderForWriteMode.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.miscellaneous;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.NodePropertiesWritten;
@@ -40,7 +39,6 @@ class ScalePropertiesResultBuilderForWriteMode implements ResultBuilder<ScalePro
     @Override
     public Stream<ScalePropertiesWriteResult> build(
         Graph graph,
-        GraphStore graphStore,
         ScalePropertiesWriteConfig configuration,
         Optional<ScalePropertiesResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/miscellaneous/stubs/CollapsePathResultBuilderForMutateMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/miscellaneous/stubs/CollapsePathResultBuilderForMutateMode.java
index a8b54ad350..1b11b4630d 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/miscellaneous/stubs/CollapsePathResultBuilderForMutateMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/miscellaneous/stubs/CollapsePathResultBuilderForMutateMode.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.miscellaneous.stubs;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.core.loading.SingleTypeRelationships;
@@ -33,7 +32,6 @@ class CollapsePathResultBuilderForMutateMode implements ResultBuilder<CollapsePa
     @Override
     public CollapsePathMutateResult build(
         Graph graph,
-        GraphStore graphStore,
         CollapsePathConfig configuration,
         Optional<SingleTypeRelationships> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/miscellaneous/stubs/IndexInverseResultBuilderForMutateMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/miscellaneous/stubs/IndexInverseResultBuilderForMutateMode.java
index 11188fe6c6..ee0890e206 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/miscellaneous/stubs/IndexInverseResultBuilderForMutateMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/miscellaneous/stubs/IndexInverseResultBuilderForMutateMode.java
@@ -21,7 +21,6 @@
 
 import org.neo4j.gds.RelationshipType;
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.core.loading.SingleTypeRelationships;
@@ -35,7 +34,6 @@ class IndexInverseResultBuilderForMutateMode implements ResultBuilder<InverseRel
     @Override
     public IndexInverseMutateResult build(
         Graph graph,
-        GraphStore graphStore,
         InverseRelationshipsConfig configuration,
         Optional<Map<RelationshipType, SingleTypeRelationships>> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/miscellaneous/stubs/ScalePropertiesResultBuilderForMutateMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/miscellaneous/stubs/ScalePropertiesResultBuilderForMutateMode.java
index 91513a19f6..ac52587119 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/miscellaneous/stubs/ScalePropertiesResultBuilderForMutateMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/miscellaneous/stubs/ScalePropertiesResultBuilderForMutateMode.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.miscellaneous.stubs;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.NodePropertiesWritten;
@@ -40,7 +39,6 @@ class ScalePropertiesResultBuilderForMutateMode implements ResultBuilder<ScalePr
     @Override
     public ScalePropertiesMutateResult build(
         Graph graph,
-        GraphStore graphStore,
         ScalePropertiesMutateConfig configuration,
         Optional<ScalePropertiesResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/miscellaneous/stubs/ToUndirectedResultBuilderForMutateMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/miscellaneous/stubs/ToUndirectedResultBuilderForMutateMode.java
index c8644ba846..d64ab5abb8 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/miscellaneous/stubs/ToUndirectedResultBuilderForMutateMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/miscellaneous/stubs/ToUndirectedResultBuilderForMutateMode.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.miscellaneous.stubs;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.RelationshipsWritten;
@@ -34,7 +33,6 @@ class ToUndirectedResultBuilderForMutateMode implements ResultBuilder<ToUndirect
     @Override
     public ToUndirectedMutateResult build(
         Graph graph,
-        GraphStore graphStore,
         ToUndirectedConfig configuration,
         Optional<SingleTypeRelationships> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/BellmanFordResultBuilderForWriteMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/BellmanFordResultBuilderForWriteMode.java
index 7140c7a35b..3789bed99a 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/BellmanFordResultBuilderForWriteMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/BellmanFordResultBuilderForWriteMode.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.pathfinding;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.RelationshipsWritten;
@@ -33,7 +32,6 @@ class BellmanFordResultBuilderForWriteMode implements ResultBuilder<AllShortestP
     @Override
     public BellmanFordWriteResult build(
         Graph graph,
-        GraphStore graphStore,
         AllShortestPathsBellmanFordWriteConfig configuration,
         Optional<BellmanFordResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/KSpanningTreeResultBuilderForWriteMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/KSpanningTreeResultBuilderForWriteMode.java
index 830d10e316..8c46694f37 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/KSpanningTreeResultBuilderForWriteMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/KSpanningTreeResultBuilderForWriteMode.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.pathfinding;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.kspanningtree.KSpanningTreeWriteConfig;
@@ -32,7 +31,6 @@ class KSpanningTreeResultBuilderForWriteMode implements ResultBuilder<KSpanningT
     @Override
     public KSpanningTreeWriteResult build(
         Graph graph,
-        GraphStore graphStore,
         KSpanningTreeWriteConfig configuration,
         Optional<SpanningTree> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/PathFindingResultBuilderForMutateMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/PathFindingResultBuilderForMutateMode.java
index 41cff73503..4405009509 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/PathFindingResultBuilderForMutateMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/PathFindingResultBuilderForMutateMode.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.pathfinding;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.RelationshipsWritten;
@@ -33,7 +32,6 @@ public class PathFindingResultBuilderForMutateMode<CONFIGURATION extends ToMapCo
     @Override
     public PathFindingMutateResult build(
         Graph graph,
-        GraphStore graphStore,
         CONFIGURATION configuration,
         Optional<PathFindingResult> pathFindingResult,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/PathFindingResultBuilderForWriteMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/PathFindingResultBuilderForWriteMode.java
index 255202b544..0d79dd2d19 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/PathFindingResultBuilderForWriteMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/PathFindingResultBuilderForWriteMode.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.pathfinding;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.RelationshipsWritten;
@@ -34,7 +33,6 @@ class PathFindingResultBuilderForWriteMode<CONFIGURATION extends ToMapConvertibl
     @Override
     public StandardWriteRelationshipsResult build(
         Graph graph,
-        GraphStore graphStore,
         CONFIGURATION configuration,
         Optional<PathFindingResult> pathFindingResult,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/SpanningTreeResultBuilderForWriteMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/SpanningTreeResultBuilderForWriteMode.java
index 494627f913..9989df60b1 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/SpanningTreeResultBuilderForWriteMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/SpanningTreeResultBuilderForWriteMode.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.pathfinding;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.RelationshipsWritten;
@@ -33,7 +32,6 @@ class SpanningTreeResultBuilderForWriteMode implements ResultBuilder<SpanningTre
     @Override
     public SpanningTreeWriteResult build(
         Graph graph,
-        GraphStore graphStore,
         SpanningTreeWriteConfig configuration,
         Optional<SpanningTree> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/SteinerTreeResultBuilderForWriteMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/SteinerTreeResultBuilderForWriteMode.java
index 34610d266f..304915b5f7 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/SteinerTreeResultBuilderForWriteMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/SteinerTreeResultBuilderForWriteMode.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.pathfinding;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.RelationshipsWritten;
@@ -33,7 +32,6 @@ class SteinerTreeResultBuilderForWriteMode implements ResultBuilder<SteinerTreeW
     @Override
     public SteinerWriteResult build(
         Graph graph,
-        GraphStore graphStore,
         SteinerTreeWriteConfig steinerTreeWriteConfig,
         Optional<SteinerTreeResult> steinerTreeResult,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/BellmanFordResultBuilderForMutateMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/BellmanFordResultBuilderForMutateMode.java
index 40c3ef1102..b5d90130a9 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/BellmanFordResultBuilderForMutateMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/BellmanFordResultBuilderForMutateMode.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.pathfinding.stubs;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.RelationshipsWritten;
@@ -34,7 +33,6 @@ public class BellmanFordResultBuilderForMutateMode implements ResultBuilder<AllS
     @Override
     public BellmanFordMutateResult build(
         Graph graph,
-        GraphStore graphStore,
         AllShortestPathsBellmanFordMutateConfig configuration,
         Optional<BellmanFordResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/BreadthFirstSearchResultBuilderForMutateMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/BreadthFirstSearchResultBuilderForMutateMode.java
index f2903cd902..bdb491aa5b 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/BreadthFirstSearchResultBuilderForMutateMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/BreadthFirstSearchResultBuilderForMutateMode.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.pathfinding.stubs;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.RelationshipsWritten;
@@ -34,7 +33,6 @@ public class BreadthFirstSearchResultBuilderForMutateMode implements ResultBuild
     @Override
     public PathFindingMutateResult build(
         Graph graph,
-        GraphStore graphStore,
         BfsMutateConfig configuration,
         Optional<HugeLongArray> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/DepthFirstSearchResultBuilderForMutateMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/DepthFirstSearchResultBuilderForMutateMode.java
index 55b47c182a..c74ebe8fde 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/DepthFirstSearchResultBuilderForMutateMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/DepthFirstSearchResultBuilderForMutateMode.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.pathfinding.stubs;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.RelationshipsWritten;
@@ -34,7 +33,6 @@ public class DepthFirstSearchResultBuilderForMutateMode implements ResultBuilder
     @Override
     public PathFindingMutateResult build(
         Graph graph,
-        GraphStore graphStore,
         DfsMutateConfig configuration,
         Optional<HugeLongArray> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/RandomWalkResultBuilderForMutateMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/RandomWalkResultBuilderForMutateMode.java
index ca89a0209e..8a05d56385 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/RandomWalkResultBuilderForMutateMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/RandomWalkResultBuilderForMutateMode.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.pathfinding.stubs;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.NodePropertiesWritten;
@@ -34,7 +33,6 @@ public class RandomWalkResultBuilderForMutateMode implements ResultBuilder<Rando
     @Override
     public RandomWalkMutateResult build(
         Graph graph,
-        GraphStore graphStore,
         RandomWalkMutateConfig configuration,
         Optional<HugeAtomicLongArray> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/SpanningTreeResultBuilderForMutateMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/SpanningTreeResultBuilderForMutateMode.java
index fafc93209a..afc6499d11 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/SpanningTreeResultBuilderForMutateMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/SpanningTreeResultBuilderForMutateMode.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.pathfinding.stubs;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.RelationshipsWritten;
@@ -34,7 +33,6 @@ public class SpanningTreeResultBuilderForMutateMode implements ResultBuilder<Spa
     @Override
     public SpanningTreeMutateResult build(
         Graph graph,
-        GraphStore graphStore,
         SpanningTreeMutateConfig configuration,
         Optional<SpanningTree> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/SteinerTreeResultBuilderForMutateMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/SteinerTreeResultBuilderForMutateMode.java
index d0f9c7804e..c5be5fe2a8 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/SteinerTreeResultBuilderForMutateMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/SteinerTreeResultBuilderForMutateMode.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.procedures.algorithms.pathfinding.stubs;
 
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.RelationshipsWritten;
@@ -34,7 +33,6 @@ public class SteinerTreeResultBuilderForMutateMode implements ResultBuilder<Stei
     @Override
     public SteinerMutateResult build(
         Graph graph,
-        GraphStore graphStore,
         SteinerTreeMutateConfig steinerTreeMutateConfig,
         Optional<SteinerTreeResult> steinerTreeResult,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/similarity/FilteredKnnResultBuilderForMutateMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/similarity/FilteredKnnResultBuilderForMutateMode.java
index 0646b167e3..7f36527ffa 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/similarity/FilteredKnnResultBuilderForMutateMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/similarity/FilteredKnnResultBuilderForMutateMode.java
@@ -21,7 +21,6 @@
 
 import org.apache.commons.lang3.tuple.Pair;
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.RelationshipsWritten;
@@ -38,7 +37,6 @@ public class FilteredKnnResultBuilderForMutateMode implements ResultBuilder<Filt
     @Override
     public KnnMutateResult build(
         Graph graph,
-        GraphStore graphStore,
         FilteredKnnMutateConfig configuration,
         Optional<FilteredKnnResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/similarity/FilteredKnnResultBuilderForWriteMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/similarity/FilteredKnnResultBuilderForWriteMode.java
index 962feebfad..dbf0c73e0f 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/similarity/FilteredKnnResultBuilderForWriteMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/similarity/FilteredKnnResultBuilderForWriteMode.java
@@ -21,7 +21,6 @@
 
 import org.apache.commons.lang3.tuple.Pair;
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.RelationshipsWritten;
@@ -36,7 +35,6 @@ class FilteredKnnResultBuilderForWriteMode implements ResultBuilder<FilteredKnnW
     @Override
     public Stream<KnnWriteResult> build(
         Graph graph,
-        GraphStore graphStore,
         FilteredKnnWriteConfig configuration,
         Optional<FilteredKnnResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/similarity/FilteredNodeSimilarityResultBuilderForMutateMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/similarity/FilteredNodeSimilarityResultBuilderForMutateMode.java
index 4244e05089..38aecf6a34 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/similarity/FilteredNodeSimilarityResultBuilderForMutateMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/similarity/FilteredNodeSimilarityResultBuilderForMutateMode.java
@@ -21,7 +21,6 @@
 
 import org.apache.commons.lang3.tuple.Pair;
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.RelationshipsWritten;
@@ -35,7 +34,6 @@ public class FilteredNodeSimilarityResultBuilderForMutateMode implements ResultB
     @Override
     public SimilarityMutateResult build(
         Graph graph,
-        GraphStore graphStore,
         FilteredNodeSimilarityMutateConfig configuration,
         Optional<NodeSimilarityResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/similarity/FilteredNodeSimilarityResultBuilderForWriteMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/similarity/FilteredNodeSimilarityResultBuilderForWriteMode.java
index a6df4383c4..00e824be8a 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/similarity/FilteredNodeSimilarityResultBuilderForWriteMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/similarity/FilteredNodeSimilarityResultBuilderForWriteMode.java
@@ -21,7 +21,6 @@
 
 import org.apache.commons.lang3.tuple.Pair;
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.RelationshipsWritten;
@@ -38,7 +37,6 @@ class FilteredNodeSimilarityResultBuilderForWriteMode implements ResultBuilder<F
     @Override
     public Stream<SimilarityWriteResult> build(
         Graph graph,
-        GraphStore graphStore,
         FilteredNodeSimilarityWriteConfig configuration,
         Optional<NodeSimilarityResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/similarity/KnnResultBuilderForMutateMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/similarity/KnnResultBuilderForMutateMode.java
index 654214e7bb..539e40c81b 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/similarity/KnnResultBuilderForMutateMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/similarity/KnnResultBuilderForMutateMode.java
@@ -21,7 +21,6 @@
 
 import org.apache.commons.lang3.tuple.Pair;
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.RelationshipsWritten;
@@ -38,7 +37,6 @@ public class KnnResultBuilderForMutateMode implements ResultBuilder<KnnMutateCon
     @Override
     public KnnMutateResult build(
         Graph graph,
-        GraphStore graphStore,
         KnnMutateConfig configuration,
         Optional<KnnResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/similarity/KnnResultBuilderForWriteMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/similarity/KnnResultBuilderForWriteMode.java
index 6baa89d1dc..43746fc463 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/similarity/KnnResultBuilderForWriteMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/similarity/KnnResultBuilderForWriteMode.java
@@ -21,7 +21,6 @@
 
 import org.apache.commons.lang3.tuple.Pair;
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.RelationshipsWritten;
@@ -36,7 +35,6 @@ class KnnResultBuilderForWriteMode implements ResultBuilder<KnnWriteConfig, KnnR
     @Override
     public Stream<KnnWriteResult> build(
         Graph graph,
-        GraphStore graphStore,
         KnnWriteConfig configuration,
         Optional<KnnResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/similarity/NodeSimilarityResultBuilderForMutateMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/similarity/NodeSimilarityResultBuilderForMutateMode.java
index a380d76e30..5eb7b4b3da 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/similarity/NodeSimilarityResultBuilderForMutateMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/similarity/NodeSimilarityResultBuilderForMutateMode.java
@@ -21,7 +21,6 @@
 
 import org.apache.commons.lang3.tuple.Pair;
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.RelationshipsWritten;
@@ -35,7 +34,6 @@ public class NodeSimilarityResultBuilderForMutateMode implements ResultBuilder<N
     @Override
     public SimilarityMutateResult build(
         Graph graph,
-        GraphStore graphStore,
         NodeSimilarityMutateConfig configuration,
         Optional<NodeSimilarityResult> result,
         AlgorithmProcessingTimings timings,
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/similarity/NodeSimilarityResultBuilderForWriteMode.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/similarity/NodeSimilarityResultBuilderForWriteMode.java
index 5d7a47c21e..6e55b23045 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/similarity/NodeSimilarityResultBuilderForWriteMode.java
+++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/similarity/NodeSimilarityResultBuilderForWriteMode.java
@@ -21,7 +21,6 @@
 
 import org.apache.commons.lang3.tuple.Pair;
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.RelationshipsWritten;
@@ -38,7 +37,6 @@ class NodeSimilarityResultBuilderForWriteMode implements ResultBuilder<NodeSimil
     @Override
     public Stream<SimilarityWriteResult> build(
         Graph graph,
-        GraphStore graphStore,
         NodeSimilarityWriteConfig configuration,
         Optional<NodeSimilarityResult> result,
         AlgorithmProcessingTimings timings,