diff --git a/core/cleaner/src/main/java/com/cognifide/aet/cleaner/context/SuiteAggregationCounter.java b/core/cleaner/src/main/java/com/cognifide/aet/cleaner/context/SuiteAggregationCounter.java
index 3a17fe223..c372718d4 100644
--- a/core/cleaner/src/main/java/com/cognifide/aet/cleaner/context/SuiteAggregationCounter.java
+++ b/core/cleaner/src/main/java/com/cognifide/aet/cleaner/context/SuiteAggregationCounter.java
@@ -19,17 +19,14 @@ public class SuiteAggregationCounter {
 
   public static final String NAME_KEY = "suiteAggregationCounter";
 
-  private int suitesToAggregate;
+  private final int suitesToAggregate;
 
-  public SuiteAggregationCounter() {
-    this.suitesToAggregate = 0;
+  public SuiteAggregationCounter(int suitesToAggregate) {
+    this.suitesToAggregate = suitesToAggregate;
   }
 
   public int getSuitesToAggregate() {
     return suitesToAggregate;
   }
 
-  public void addSuitesToAggregate(int suitesToAggregate) {
-    this.suitesToAggregate += suitesToAggregate;
-  }
 }
diff --git a/core/cleaner/src/main/java/com/cognifide/aet/cleaner/processors/FetchAllProjectSuitesProcessor.java b/core/cleaner/src/main/java/com/cognifide/aet/cleaner/processors/FetchAllProjectSuitesProcessor.java
index 1301a4a80..7d7a44f47 100644
--- a/core/cleaner/src/main/java/com/cognifide/aet/cleaner/processors/FetchAllProjectSuitesProcessor.java
+++ b/core/cleaner/src/main/java/com/cognifide/aet/cleaner/processors/FetchAllProjectSuitesProcessor.java
@@ -74,7 +74,8 @@ public AllSuiteVersionsMessageBody apply(Map.Entry<String, Collection<Suite>> in
             }).toList();
 
     exchange.getOut().setBody(body);
-    exchange.getOut().setHeader(SuiteAggregationCounter.NAME_KEY, new SuiteAggregationCounter());
+    exchange.getOut().setHeader(SuiteAggregationCounter.NAME_KEY,
+        new SuiteAggregationCounter(allProjectSuites.size()));
     exchange.getOut().setHeader(CleanerContext.KEY_NAME, cleanerContext);
   }
 
diff --git a/core/cleaner/src/main/java/com/cognifide/aet/cleaner/processors/SuitesRemovePredicateProcessor.java b/core/cleaner/src/main/java/com/cognifide/aet/cleaner/processors/SuitesRemovePredicateProcessor.java
index 0201df401..5996a2c8c 100644
--- a/core/cleaner/src/main/java/com/cognifide/aet/cleaner/processors/SuitesRemovePredicateProcessor.java
+++ b/core/cleaner/src/main/java/com/cognifide/aet/cleaner/processors/SuitesRemovePredicateProcessor.java
@@ -49,10 +49,6 @@ public void process(Exchange exchange) throws Exception {
     final Collection<Suite> suiteVersions = allSuiteVersions.getAllVersions();
     final DBKey dbKey = allSuiteVersions.getDbKey();
 
-    SuiteAggregationCounter suiteAggregationCounter = exchange.getIn()
-        .getHeader(SuiteAggregationCounter.NAME_KEY, SuiteAggregationCounter.class);
-    suiteAggregationCounter.addSuitesToAggregate(suiteVersions.size());
-
     LOGGER.info("Processing suite `{}` with {} version(s) in {}", allSuiteVersions.getData(),
         suiteVersions.size(), dbKey);
 
@@ -68,8 +64,8 @@ public SuiteMessageBody apply(Suite suite) {
         }).toList();
 
     exchange.getOut().setBody(body);
-    exchange.getOut().setHeader(SuiteAggregationCounter.NAME_KEY,
-        suiteAggregationCounter);
+    exchange.getOut().setHeader(SuiteAggregationCounter.NAME_KEY, exchange.getIn()
+        .getHeader(SuiteAggregationCounter.NAME_KEY, SuiteAggregationCounter.class));
     exchange.getOut().setHeader(CleanerContext.KEY_NAME, cleanerContext);
   }
 }
diff --git a/core/cleaner/src/main/java/com/cognifide/aet/cleaner/route/SuitesAggregationStrategy.java b/core/cleaner/src/main/java/com/cognifide/aet/cleaner/route/SuitesAggregationStrategy.java
index bcefdf859..53b8a6b77 100644
--- a/core/cleaner/src/main/java/com/cognifide/aet/cleaner/route/SuitesAggregationStrategy.java
+++ b/core/cleaner/src/main/java/com/cognifide/aet/cleaner/route/SuitesAggregationStrategy.java
@@ -57,6 +57,6 @@ private boolean isFirstAggregation(Exchange oldExchange) {
   public void onCompletion(Exchange exchange) {
     ReferencedArtifactsMessageBody body = exchange.getIn()
         .getBody(ReferencedArtifactsMessageBody.class);
-    LOGGER.debug("Finished aggregating {}", body.getData());
+    LOGGER.debug("Finished aggregating {}", body.getDbKey());
   }
 }