diff --git a/corsika/detail/framework/geometry/CoordinateSystem.inl b/corsika/detail/framework/geometry/CoordinateSystem.inl
index faa759aa769f9cd3382d06bca45377bb5488c3ee..12e914ba9d4131209d4be8fa7eec066e9961a97a 100644
--- a/corsika/detail/framework/geometry/CoordinateSystem.inl
+++ b/corsika/detail/framework/geometry/CoordinateSystem.inl
@@ -75,7 +75,7 @@ namespace corsika {
   inline CoordinateSystemPtr make_translation(CoordinateSystemPtr const& cs,
                                               QuantityVector<length_d> const& vector) {
     EigenTransform const translation{EigenTranslation(vector.getEigenVector())};
-    return std::make_shared<CoordinateSystem const>(CoordinateSystem(cs, translation));
+    return CoordinateSystemPtr{new CoordinateSystem(cs, translation)};
   }
 
   template <typename TDim>
@@ -105,8 +105,7 @@ namespace corsika {
           0, 0, (a1 * a1 + a2 * a2) * c;  // .
     }
 
-    return std::make_shared<CoordinateSystem const>(
-        CoordinateSystem(cs, EigenTransform(A + B)));
+    return CoordinateSystemPtr{new CoordinateSystem{cs, EigenTransform{A + B}}};
   }
 
   template <typename TDim>
@@ -120,7 +119,7 @@ namespace corsika {
     EigenTransform const rotation{
         Eigen::AngleAxisd(angle, axis.getEigenVector().normalized())};
 
-    return std::make_shared<CoordinateSystem const>(CoordinateSystem(cs, rotation));
+    return CoordinateSystemPtr{new CoordinateSystem{cs, rotation}};
   }
 
   template <typename TDim>
@@ -135,7 +134,7 @@ namespace corsika {
         Eigen::AngleAxisd(angle, axis.getEigenVector().normalized()) *
         EigenTranslation(translation.getEigenVector())};
 
-    return std::make_shared<CoordinateSystem const>(CoordinateSystem(cs, transf));
+    return CoordinateSystemPtr{new CoordinateSystem{cs, transf}};
   }
 
 } // namespace corsika
diff --git a/corsika/framework/geometry/CoordinateSystem.hpp b/corsika/framework/geometry/CoordinateSystem.hpp
index f15b89e994d6399600322b479a287d1a726e1abd..13a8461cade7a2759bf511f3d93cc6545e8698bb 100644
--- a/corsika/framework/geometry/CoordinateSystem.hpp
+++ b/corsika/framework/geometry/CoordinateSystem.hpp
@@ -109,8 +109,8 @@ namespace corsika {
 
   public:
     // default resource allocation
-    CoordinateSystem(CoordinateSystem const&) = default;
-    CoordinateSystem(CoordinateSystem&&) = default;
+    CoordinateSystem(CoordinateSystem const&) = delete;
+    CoordinateSystem(CoordinateSystem&&) = delete;
     CoordinateSystem& operator=(CoordinateSystem const& pCS) =
         delete; // avoid making copies
     ~CoordinateSystem() = default;
@@ -128,8 +128,6 @@ namespace corsika {
     bool operator!=(CoordinateSystem const&) const;
 
   protected:
-    static CoordinateSystem createCS() { return CoordinateSystem(); }
-
     /**
      * \name Friends
      * Manipulation and creation functions.