diff --git a/.gitmodules b/.gitmodules
index 222c244370..339cea6a49 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,8 +4,8 @@
 
 [submodule "submodules/dccrg"]
 	path = submodules/dccrg
-	url = https://github.com/fmihpc/dccrg.git
-	branch = vlasiator-version
+	url = https://github.com/pedr-nz/dccrg.git
+	branch = attempt2-rmBoost
 
 [submodule "submodules/eigen"]
 	path = submodules/eigen
diff --git a/submodules/dccrg b/submodules/dccrg
index e7aa94fb29..f086044ff1 160000
--- a/submodules/dccrg
+++ b/submodules/dccrg
@@ -1 +1 @@
-Subproject commit e7aa94fb298e9971d50ff6f49a0356ebd66ac99d
+Subproject commit f086044ff1cf683ca125e61c9e43e4584b6a00bf
diff --git a/vlasovsolver/cpu_trans_pencils.cpp b/vlasovsolver/cpu_trans_pencils.cpp
index b9a33f7b3a..06f822ffb5 100644
--- a/vlasovsolver/cpu_trans_pencils.cpp
+++ b/vlasovsolver/cpu_trans_pencils.cpp
@@ -1304,7 +1304,7 @@ void printPencilsFunc(const setOfPencils& pencils, const uint dimension, const i
       for (auto id : cells) {
          ss << id << " ";
          for (auto [bin2, cells2] : pencils.targetCellsInBin) {
-            if (bin != bin2 && cells2.contains(id)) {
+            if (bin != bin2 && cells2.count(id)>0) {
                collisions.insert(bin2);
             }
          }
diff --git a/vlasovsolver/cpu_trans_pencils.hpp b/vlasovsolver/cpu_trans_pencils.hpp
index 3734b8bc43..c8bbc015a2 100644
--- a/vlasovsolver/cpu_trans_pencils.hpp
+++ b/vlasovsolver/cpu_trans_pencils.hpp
@@ -136,7 +136,7 @@ struct setOfPencils {
          for (auto id = ids.begin() + idsStart[i]; id < ids.begin() + idsStart[i] + lengthOfPencils[i]; ++id) {
             // We don't need to consider source and target cells of the pencil separately
             // as all pencils with source/target cell C must be in the same bin as all pencils with target C
-            if (*id && allTargetCells.contains(*id)) {
+            if (*id && allTargetCells.count(*id)>0) {
                targetCellsInBin[i].insert(*id);
             }
          }
@@ -148,18 +148,18 @@ struct setOfPencils {
       do {
          binsToDelete.clear();
          for (auto& [binIndex1, cellsInBin1] : targetCellsInBin) {
-            if (binsToDelete.contains(binIndex1)) {
+            if (binsToDelete.count(binIndex1)>0) {
                continue;
             }
 
             for (auto& [binIndex2, cellsInBin2] : targetCellsInBin) {
-               if (binIndex1 == binIndex2 || binsToDelete.contains(binIndex2)) {
+               if (binIndex1 == binIndex2 || binsToDelete.count(binIndex2)>0) {
                   continue;
                }
 
                // Check for overlapping cells
                for (auto cell : cellsInBin2) {
-                  if (cellsInBin1.contains(cell)) {
+                  if (cellsInBin1.count(cell)>0) {
                      binsToDelete.insert(binIndex2);
 
                      // Insert all cells from bin2 to bin1