diff --git a/corsika/setup/SetupStack.hpp b/corsika/setup/SetupStack.hpp
index 88770f2289e64b55bde54532ab914c86a9c15c66..6c9696d899be01c7ae4eff98000b5ebe394b293f 100644
--- a/corsika/setup/SetupStack.hpp
+++ b/corsika/setup/SetupStack.hpp
@@ -71,14 +71,6 @@ namespace corsika::setup {
 #elif defined(__GNUC__) || defined(__GNUG__)
   using StackView = corsika::MakeView<setup::Stack>::type;
 #endif
-  } // namespace detail
-
-#endif
-
-  // ---------------------------------------
-  // this is the FINAL stackitertor (particle type) we use in C8:
-
-  using StackView = detail::TheStackView;
 
 #endif // WITH_HISTORY
 
diff --git a/tests/framework/testGeometry.cpp b/tests/framework/testGeometry.cpp
index dd860f2df535e75871c9e1bba0b0dfc5db20905b..8f9ef0b85d03833da0813709bcf939fb8ccc2f37 100644
--- a/tests/framework/testGeometry.cpp
+++ b/tests/framework/testGeometry.cpp
@@ -177,64 +177,6 @@ TEST_CASE("transformations between CoordinateSystems") {
               zPrime.getComponents(rootCS).getEigenVector()) ==
           Approx((5_m * 5_m).magnitude()));
   }
-
-  SECTION("RotateToZ positive") {
-    Vector const v{rootCS, 0_m, 1_m, 1_m};
-    auto const csPrime = rootCS.RotateToZ(v);
-    Vector const zPrime{csPrime, 0_m, 0_m, 5_m};
-    Vector const xPrime{csPrime, 5_m, 0_m, 0_m};
-    Vector const yPrime{csPrime, 0_m, 5_m, 0_m};
-
-    CHECK(xPrime.dot(v).magnitude() == Approx(0).margin(absMargin));
-    CHECK(yPrime.dot(v).magnitude() == Approx(0).margin(absMargin));
-    CHECK((zPrime.dot(v) / 1_m).magnitude() == Approx(5 * sqrt(2)));
-
-    CHECK(zPrime.GetComponents(rootCS)[1].magnitude() ==
-          Approx(zPrime.GetComponents(rootCS)[2].magnitude()));
-    CHECK(zPrime.GetComponents(rootCS)[0].magnitude() == Approx(0));
-
-    CHECK(xPrime.GetComponents(rootCS).eVector.dot(
-              yPrime.GetComponents(rootCS).eVector) == Approx(0));
-    CHECK(zPrime.GetComponents(rootCS).eVector.dot(
-              xPrime.GetComponents(rootCS).eVector) == Approx(0));
-    CHECK(yPrime.GetComponents(rootCS).eVector.dot(
-              zPrime.GetComponents(rootCS).eVector) == Approx(0));
-
-    CHECK(yPrime.GetComponents(rootCS).eVector.dot(
-              yPrime.GetComponents(rootCS).eVector) == Approx((5_m * 5_m).magnitude()));
-    CHECK(xPrime.GetComponents(rootCS).eVector.dot(
-              xPrime.GetComponents(rootCS).eVector) == Approx((5_m * 5_m).magnitude()));
-    CHECK(zPrime.GetComponents(rootCS).eVector.dot(
-              zPrime.GetComponents(rootCS).eVector) == Approx((5_m * 5_m).magnitude()));
-  }
-
-  SECTION("RotateToZ negative") {
-    Vector const v{rootCS, 0_m, 0_m, -1_m};
-    auto const csPrime = rootCS.RotateToZ(v);
-    Vector const zPrime{csPrime, 0_m, 0_m, 5_m};
-    Vector const xPrime{csPrime, 5_m, 0_m, 0_m};
-    Vector const yPrime{csPrime, 0_m, 5_m, 0_m};
-
-    CHECK(zPrime.dot(v).magnitude() > 0);
-    CHECK(xPrime.GetComponents(rootCS).eVector.dot(v.GetComponents().eVector) ==
-          Approx(0));
-    CHECK(yPrime.GetComponents(rootCS).eVector.dot(v.GetComponents().eVector) ==
-          Approx(0));
-
-    CHECK(xPrime.GetComponents(rootCS).eVector.dot(
-              yPrime.GetComponents(rootCS).eVector) == Approx(0));
-    CHECK(zPrime.GetComponents(rootCS).eVector.dot(
-              xPrime.GetComponents(rootCS).eVector) == Approx(0));
-    CHECK(yPrime.GetComponents(rootCS).eVector.dot(
-              zPrime.GetComponents(rootCS).eVector) == Approx(0));
-
-    CHECK(yPrime.GetComponents(rootCS).eVector.dot(
-              yPrime.GetComponents(rootCS).eVector) == Approx((5_m * 5_m).magnitude()));
-    CHECK(xPrime.GetComponents(rootCS).eVector.dot(
-              xPrime.GetComponents(rootCS).eVector) == Approx((5_m * 5_m).magnitude()));
-    CHECK(zPrime.GetComponents(rootCS).eVector.dot(
-              zPrime.GetComponents(rootCS).eVector) == Approx((5_m * 5_m).magnitude()));
-  }
 }
 
 TEST_CASE("CoordinateSystem hirarchy") {