diff --git a/corsika/detail/setup/SetupStack.hpp b/corsika/detail/setup/SetupStack.hpp
index bec6c0aa1595a59d20f0ef044827e39608e23440..2409dd97ee9363f32ec2ab26080a8ba3a0d28cef 100644
--- a/corsika/detail/setup/SetupStack.hpp
+++ b/corsika/detail/setup/SetupStack.hpp
@@ -14,13 +14,15 @@
 #include <corsika/stack/WeightStackExtension.hpp>
 #include <corsika/stack/history/HistorySecondaryProducer.hpp>
 #include <corsika/stack/history/HistoryStackExtension.hpp>
-
-#include <corsika/setup/SetupEnvironment.hpp>
+#include <corsika/media/Environment.hpp>
+#include <corsika/media/IMagneticFieldModel.hpp>
+#include <corsika/media/IMediumModel.hpp>
+#include <corsika/media/IMediumPropertyModel.hpp>
 
 namespace corsika {
 
   namespace setup::detail {
-    template <typename TEnvironment = setup::Environment>
+    template <typename TEnvironment>
     class StackGenerator {
     private:
       using env_type = TEnvironment;
diff --git a/corsika/setup/SetupEnvironment.hpp b/corsika/setup/SetupEnvironment.hpp
deleted file mode 100644
index b7f59b31b6aa34d914206285f37463ce4981cb37..0000000000000000000000000000000000000000
--- a/corsika/setup/SetupEnvironment.hpp
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
- *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
- */
-
-#pragma once
-
-#include <corsika/media/Environment.hpp>
-#include <corsika/media/IMagneticFieldModel.hpp>
-#include <corsika/media/IMediumModel.hpp>
-#include <corsika/media/IMediumPropertyModel.hpp>
-#include <corsika/media/IRefractiveIndexModel.hpp>
-
-namespace corsika::setup {
-
-  /**
-     Definition of the default environemnt model interface. Each model
-     interface provides properties of the environment in a position
-     bdependent way.
-   */
-
-  using EnvironmentInterface = IMediumPropertyModel<IMagneticFieldModel<IMediumModel>>;
-  using Environment = Environment<EnvironmentInterface>;
-
-} // end namespace corsika::setup
diff --git a/examples/boundary_example.cpp b/examples/boundary_example.cpp
index bffda918f64b3fc7ef79193f6470f9d104f9e711..36866057baf5b01bfe0c6df970aff52be2ce7eba 100644
--- a/examples/boundary_example.cpp
+++ b/examples/boundary_example.cpp
@@ -17,7 +17,6 @@
 
 #include <corsika/output/OutputManager.hpp>
 
-#include <corsika/setup/SetupEnvironment.hpp>
 #include <corsika/setup/SetupStack.hpp>
 #include <corsika/setup/SetupTrajectory.hpp>
 
diff --git a/examples/cascade_example.cpp b/examples/cascade_example.cpp
index b43428ae50e482f0760b4bb133bc0cd4fbfa1c14..ce61dd9e7d18f3c1dace87c00b45c3f0060e69ee 100644
--- a/examples/cascade_example.cpp
+++ b/examples/cascade_example.cpp
@@ -27,7 +27,6 @@
 #include <corsika/media/MediumPropertyModel.hpp>
 #include <corsika/media/UniformMagneticField.hpp>
 
-#include <corsika/setup/SetupEnvironment.hpp>
 #include <corsika/setup/SetupStack.hpp>
 #include <corsika/setup/SetupTrajectory.hpp>
 
diff --git a/examples/cascade_proton_example.cpp b/examples/cascade_proton_example.cpp
index 7f41162b2feaf3efa785711697d17243a0e6ca89..5a78452390575c9aae26d277b5776be001538d4b 100644
--- a/examples/cascade_proton_example.cpp
+++ b/examples/cascade_proton_example.cpp
@@ -27,7 +27,6 @@
 #include <corsika/media/MediumPropertyModel.hpp>
 #include <corsika/media/UniformMagneticField.hpp>
 
-#include <corsika/setup/SetupEnvironment.hpp>
 #include <corsika/setup/SetupStack.hpp>
 #include <corsika/setup/SetupTrajectory.hpp>
 
diff --git a/examples/particle_list_example.cpp b/examples/particle_list_example.cpp
index 29e4bdc5f8e3b33a6100621ed5a230588d4b2faa..241fda60d53fbeb8d5d9e7862c3a7df51b7a1235 100644
--- a/examples/particle_list_example.cpp
+++ b/examples/particle_list_example.cpp
@@ -9,7 +9,6 @@
 #include <corsika/framework/core/ParticleProperties.hpp>
 #include <corsika/modules/QGSJetII.hpp>
 #include <corsika/modules/Sibyll.hpp>
-#include <corsika/setup/SetupEnvironment.hpp>
 #include <corsika/framework/core/PhysicalUnits.hpp>
 
 /*
diff --git a/tests/common/SetupTestEnvironment.hpp b/tests/common/SetupTestEnvironment.hpp
index 2be9f34d53ef3a71ea93730b10c426f98d9fdac7..a118390d061467f7087fb3dc30058361f8fab4f1 100644
--- a/tests/common/SetupTestEnvironment.hpp
+++ b/tests/common/SetupTestEnvironment.hpp
@@ -11,7 +11,10 @@
 #include <corsika/framework/geometry/Point.hpp>
 #include <corsika/framework/geometry/CoordinateSystem.hpp>
 
-#include <corsika/setup/SetupEnvironment.hpp>
+#include <corsika/media/Environment.hpp>
+#include <corsika/media/IMagneticFieldModel.hpp>
+#include <corsika/media/IMediumModel.hpp>
+#include <corsika/media/IMediumPropertyModel.hpp>
 #include <corsika/media/UniformMagneticField.hpp>
 #include <corsika/media/MediumPropertyModel.hpp>
 #include <corsika/media/HomogeneousMedium.hpp>
diff --git a/tests/common/TestStack.hpp b/tests/common/TestStack.hpp
index 299a0742964bbb42b442bc3cfac31d5fbad16ccf..2488fc1f059cfa4b4df6ed27a931feff60a62606 100644
--- a/tests/common/TestStack.hpp
+++ b/tests/common/TestStack.hpp
@@ -14,8 +14,10 @@
 #include <corsika/stack/WeightStackExtension.hpp>
 #include <corsika/stack/history/HistorySecondaryProducer.hpp>
 #include <corsika/stack/history/HistoryStackExtension.hpp>
-
-#include <corsika/setup/SetupEnvironment.hpp>
+#include <corsika/media/Environment.hpp>
+#include <corsika/media/IMagneticFieldModel.hpp>
+#include <corsika/media/IMediumModel.hpp>
+#include <corsika/media/IMediumPropertyModel.hpp>
 
 namespace corsika {