diff --git a/dumux/freeflow/stokes/CMakeLists.txt b/dumux/freeflow/stokes/CMakeLists.txt
index 99e79cdc3340869027e6fe2cffd5b176ace1a3bf..2145537a229beddb7d76ad4e6282a836be294b3f 100644
--- a/dumux/freeflow/stokes/CMakeLists.txt
+++ b/dumux/freeflow/stokes/CMakeLists.txt
@@ -1,16 +1,6 @@
 
 #install headers
 install(FILES
-stokesfluxvariables.hh
-stokesindices.hh
-stokeslocaljacobian.hh
-stokeslocalresidual.hh
-stokesmodel.hh
-stokesnewtoncontroller.hh
-stokesproblem.hh
-stokesproperties.hh
-stokespropertydefaults.hh
-stokesvolumevariables.hh
 fluxvariables.hh
 indices.hh
 localjacobian.hh
diff --git a/dumux/freeflow/stokes/stokesfluxvariables.hh b/dumux/freeflow/stokes/stokesfluxvariables.hh
deleted file mode 100644
index 911ca104b81ebc7a41c9949363d86180e4a58e4d..0000000000000000000000000000000000000000
--- a/dumux/freeflow/stokes/stokesfluxvariables.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_STOKES_FLUX_VARIABLES_HH_OLD
-#define DUMUX_STOKES_FLUX_VARIABLES_HH_OLD
-
-#warning this header is deprecated, use dumux/freeflow/stokes/fluxvariables.hh instead
-
-#include <dumux/freeflow/stokes/fluxvariables.hh>
-
-#endif
diff --git a/dumux/freeflow/stokes/stokesindices.hh b/dumux/freeflow/stokes/stokesindices.hh
deleted file mode 100644
index 0f6682181b4d25d438c3a372889f648365e08db8..0000000000000000000000000000000000000000
--- a/dumux/freeflow/stokes/stokesindices.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_STOKES_INDICES_HH_OLD
-#define DUMUX_STOKES_INDICES_HH_OLD
-
-#warning this header is deprecated, use dumux/freeflow/stokes/indices.hh instead
-
-#include <dumux/freeflow/stokes/indices.hh>
-
-#endif
diff --git a/dumux/freeflow/stokes/stokeslocaljacobian.hh b/dumux/freeflow/stokes/stokeslocaljacobian.hh
deleted file mode 100644
index 29fd616933605a8b7bd4b44519f2dac5bfdd2414..0000000000000000000000000000000000000000
--- a/dumux/freeflow/stokes/stokeslocaljacobian.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_STOKES_LOCAL_JACOBIAN_HH_OLD
-#define DUMUX_STOKES_LOCAL_JACOBIAN_HH_OLD
-
-#warning this header is deprecated, use dumux/freeflow/stokes/localjacobian.hh instead
-
-#include <dumux/freeflow/stokes/localjacobian.hh>
-
-#endif
diff --git a/dumux/freeflow/stokes/stokeslocalresidual.hh b/dumux/freeflow/stokes/stokeslocalresidual.hh
deleted file mode 100644
index 83241d68e33c5fc56017193facd0ef7efddd9214..0000000000000000000000000000000000000000
--- a/dumux/freeflow/stokes/stokeslocalresidual.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_STOKES_LOCAL_RESIDUAL_BASE_HH_OLD
-#define DUMUX_STOKES_LOCAL_RESIDUAL_BASE_HH_OLD
-
-#warning this header is deprecated, use dumux/freeflow/stokes/localresidual.hh instead
-
-#include <dumux/freeflow/stokes/localresidual.hh>
-
-#endif
diff --git a/dumux/freeflow/stokes/stokesmodel.hh b/dumux/freeflow/stokes/stokesmodel.hh
deleted file mode 100644
index cea3289d1892726bfb287f228454b886c1da4831..0000000000000000000000000000000000000000
--- a/dumux/freeflow/stokes/stokesmodel.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_STOKES_MODEL_HH_OLD
-#define DUMUX_STOKES_MODEL_HH_OLD
-
-#warning this header is deprecated, use dumux/freeflow/stokes/model.hh instead
-
-#include <dumux/freeflow/stokes/model.hh>
-
-#endif
diff --git a/dumux/freeflow/stokes/stokesnewtoncontroller.hh b/dumux/freeflow/stokes/stokesnewtoncontroller.hh
deleted file mode 100644
index dfd34f474fa1f8af65256fd8ecf37c78e6ab392d..0000000000000000000000000000000000000000
--- a/dumux/freeflow/stokes/stokesnewtoncontroller.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_STOKES_NEWTON_CONTROLLER_HH_OLD
-#define DUMUX_STOKES_NEWTON_CONTROLLER_HH_OLD
-
-#warning this header is deprecated, use dumux/freeflow/stokes/newtoncontroller.hh instead
-
-#include <dumux/freeflow/stokes/newtoncontroller.hh>
-
-#endif
diff --git a/dumux/freeflow/stokes/stokesproblem.hh b/dumux/freeflow/stokes/stokesproblem.hh
deleted file mode 100644
index a0aab07e5a212312219a1bfd9c062602658e4fd4..0000000000000000000000000000000000000000
--- a/dumux/freeflow/stokes/stokesproblem.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_STOKES_PROBLEM_HH_OLD
-#define DUMUX_STOKES_PROBLEM_HH_OLD
-
-#warning this header is deprecated, use dumux/freeflow/stokes/problem.hh instead
-
-#include <dumux/freeflow/stokes/problem.hh>
-
-#endif
diff --git a/dumux/freeflow/stokes/stokesproperties.hh b/dumux/freeflow/stokes/stokesproperties.hh
deleted file mode 100644
index b72c13fdc7f5a80899d01575eae633757474ff82..0000000000000000000000000000000000000000
--- a/dumux/freeflow/stokes/stokesproperties.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_STOKESPROPERTIES_HH_OLD
-#define DUMUX_STOKESPROPERTIES_HH_OLD
-
-#warning this header is deprecated, use dumux/freeflow/stokes/properties.hh instead
-
-#include <dumux/freeflow/stokes/properties.hh>
-
-#endif
diff --git a/dumux/freeflow/stokes/stokespropertydefaults.hh b/dumux/freeflow/stokes/stokespropertydefaults.hh
deleted file mode 100644
index 0ec5813ac959b732704d852154f87091e7a23fd7..0000000000000000000000000000000000000000
--- a/dumux/freeflow/stokes/stokespropertydefaults.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_STOKES_PROPERTY_DEFAULTS_HH_OLD
-#define DUMUX_STOKES_PROPERTY_DEFAULTS_HH_OLD
-
-#warning this header is deprecated, use dumux/freeflow/stokes/propertydefaults.hh instead
-
-#include <dumux/freeflow/stokes/propertydefaults.hh>
-
-#endif
diff --git a/dumux/freeflow/stokes/stokesvolumevariables.hh b/dumux/freeflow/stokes/stokesvolumevariables.hh
deleted file mode 100644
index 8e03da9dbceca260f0107bce81190cfd9be337e6..0000000000000000000000000000000000000000
--- a/dumux/freeflow/stokes/stokesvolumevariables.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_STOKES_VOLUME_VARIABLES_HH_OLD
-#define DUMUX_STOKES_VOLUME_VARIABLES_HH_OLD
-
-#warning this header is deprecated, use dumux/freeflow/stokes/volumevariables.hh instead
-
-#include <dumux/freeflow/stokes/volumevariables.hh>
-
-#endif
diff --git a/dumux/freeflow/stokesnc/CMakeLists.txt b/dumux/freeflow/stokesnc/CMakeLists.txt
index 7f9e9abc593ceeff3a8ff1dcfc413eab425e8b1a..6224786370d330f198c16ace346ae1d20203ac34 100644
--- a/dumux/freeflow/stokesnc/CMakeLists.txt
+++ b/dumux/freeflow/stokesnc/CMakeLists.txt
@@ -1,13 +1,6 @@
 
 #install headers
 install(FILES
-stokesncfluxvariables.hh
-stokesncindices.hh
-stokesnclocalresidual.hh
-stokesncmodel.hh
-stokesncproperties.hh
-stokesncpropertydefaults.hh
-stokesncvolumevariables.hh
 fluxvariables.hh
 indices.hh
 localresidual.hh
diff --git a/dumux/freeflow/stokesnc/stokesncfluxvariables.hh b/dumux/freeflow/stokesnc/stokesncfluxvariables.hh
deleted file mode 100644
index c524f0da6dfd1db8b23d1e42168feac63571eb0a..0000000000000000000000000000000000000000
--- a/dumux/freeflow/stokesnc/stokesncfluxvariables.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_STOKESNC_FLUX_VARIABLES_HH_OLD
-#define DUMUX_STOKESNC_FLUX_VARIABLES_HH_OLD
-
-#warning this header is deprecated, use dumux/freeflow/stokesnc/fluxvariables.hh instead
-
-#include <dumux/freeflow/stokesnc/fluxvariables.hh>
-
-#endif
diff --git a/dumux/freeflow/stokesnc/stokesncindices.hh b/dumux/freeflow/stokesnc/stokesncindices.hh
deleted file mode 100644
index 0c24b32069fff9664e81a88f8a799efac3e375db..0000000000000000000000000000000000000000
--- a/dumux/freeflow/stokesnc/stokesncindices.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_STOKESNC_INDICES_HH_OLD
-#define DUMUX_STOKESNC_INDICES_HH_OLD
-
-#warning this header is deprecated, use dumux/freeflow/stokesnc/indices.hh instead
-
-#include <dumux/freeflow/stokesnc/indices.hh>
-
-#endif
diff --git a/dumux/freeflow/stokesnc/stokesnclocalresidual.hh b/dumux/freeflow/stokesnc/stokesnclocalresidual.hh
deleted file mode 100644
index 96af18b49d4134409d8154bf856cab496161aecf..0000000000000000000000000000000000000000
--- a/dumux/freeflow/stokesnc/stokesnclocalresidual.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_STOKESNC_LOCAL_RESIDUAL_HH_OLD
-#define DUMUX_STOKESNC_LOCAL_RESIDUAL_HH_OLD
-
-#warning this header is deprecated, use dumux/freeflow/stokesnc/localresidual.hh instead
-
-#include <dumux/freeflow/stokesnc/localresidual.hh>
-
-#endif
diff --git a/dumux/freeflow/stokesnc/stokesncmodel.hh b/dumux/freeflow/stokesnc/stokesncmodel.hh
deleted file mode 100644
index bf191d5bfbd4a2e00dbf58d0b7c44795b51d3f55..0000000000000000000000000000000000000000
--- a/dumux/freeflow/stokesnc/stokesncmodel.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_STOKESNC_MODEL_HH_OLD
-#define DUMUX_STOKESNC_MODEL_HH_OLD
-
-#warning this header is deprecated, use dumux/freeflow/stokesnc/model.hh instead
-
-#include <dumux/freeflow/stokesnc/model.hh>
-
-#endif
diff --git a/dumux/freeflow/stokesnc/stokesncproperties.hh b/dumux/freeflow/stokesnc/stokesncproperties.hh
deleted file mode 100644
index 8f3ed1e93cac20bb970271b73ed9df0432e32daa..0000000000000000000000000000000000000000
--- a/dumux/freeflow/stokesnc/stokesncproperties.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_STOKESNC_PROPERTIES_HH_OLD
-#define DUMUX_STOKESNC_PROPERTIES_HH_OLD
-
-#warning this header is deprecated, use dumux/freeflow/stokesnc/properties.hh instead
-
-#include <dumux/freeflow/stokesnc/properties.hh>
-
-#endif
diff --git a/dumux/freeflow/stokesnc/stokesncpropertydefaults.hh b/dumux/freeflow/stokesnc/stokesncpropertydefaults.hh
deleted file mode 100644
index 5523de887bf4e466a9777b9b9e4c6b98726b330c..0000000000000000000000000000000000000000
--- a/dumux/freeflow/stokesnc/stokesncpropertydefaults.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_STOKESNC_PROPERTY_DEFAULTS_HH_OLD
-#define DUMUX_STOKESNC_PROPERTY_DEFAULTS_HH_OLD
-
-#warning this header is deprecated, use dumux/freeflow/stokesnc/propertydefaults.hh instead
-
-#include <dumux/freeflow/stokesnc/propertydefaults.hh>
-
-#endif
diff --git a/dumux/freeflow/stokesnc/stokesncvolumevariables.hh b/dumux/freeflow/stokesnc/stokesncvolumevariables.hh
deleted file mode 100644
index 8b6b578b8678ba1be26930a6488ef6d00f3780cf..0000000000000000000000000000000000000000
--- a/dumux/freeflow/stokesnc/stokesncvolumevariables.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_STOKESNC_VOLUME_VARIABLES_HH_OLD
-#define DUMUX_STOKESNC_VOLUME_VARIABLES_HH_OLD
-
-#warning this header is deprecated, use dumux/freeflow/stokesnc/volumevariables.hh instead
-
-#include <dumux/freeflow/stokesnc/volumevariables.hh>
-
-#endif
diff --git a/dumux/freeflow/stokesncni/CMakeLists.txt b/dumux/freeflow/stokesncni/CMakeLists.txt
index 374121643bae2b3bd44caa2e6981fde9dc06d26b..25fe5ca8b48f2b0912eecfb11c3f91faf51baa8b 100644
--- a/dumux/freeflow/stokesncni/CMakeLists.txt
+++ b/dumux/freeflow/stokesncni/CMakeLists.txt
@@ -1,13 +1,6 @@
 
 #install headers
 install(FILES
-stokesncnifluxvariables.hh
-stokesncniindices.hh
-stokesncnilocalresidual.hh
-stokesncnimodel.hh
-stokesncniproperties.hh
-stokesncnipropertydefaults.hh
-stokesncnivolumevariables.hh
 fluxvariables.hh
 indices.hh
 localresidual.hh
diff --git a/dumux/freeflow/stokesncni/stokesncnifluxvariables.hh b/dumux/freeflow/stokesncni/stokesncnifluxvariables.hh
deleted file mode 100644
index bd9945020614d380284f02f6b80b9eebaf56c6ea..0000000000000000000000000000000000000000
--- a/dumux/freeflow/stokesncni/stokesncnifluxvariables.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_STOKESNCNI_FLUX_VARIABLES_HH_OLD
-#define DUMUX_STOKESNCNI_FLUX_VARIABLES_HH_OLD
-
-#warning this header is deprecated, use dumux/freeflow/stokesncni/fluxvariables.hh instead
-
-#include <dumux/freeflow/stokesncni/fluxvariables.hh>
-
-#endif
diff --git a/dumux/freeflow/stokesncni/stokesncniindices.hh b/dumux/freeflow/stokesncni/stokesncniindices.hh
deleted file mode 100644
index e527eb235e0848c9fcffd243b77e8e65d5beba42..0000000000000000000000000000000000000000
--- a/dumux/freeflow/stokesncni/stokesncniindices.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_STOKESNCNI_INDICES_HH_OLD
-#define DUMUX_STOKESNCNI_INDICES_HH_OLD
-
-#warning this header is deprecated, use dumux/freeflow/stokesncni/indices.hh instead
-
-#include <dumux/freeflow/stokesncni/indices.hh>
-
-#endif
diff --git a/dumux/freeflow/stokesncni/stokesncnilocalresidual.hh b/dumux/freeflow/stokesncni/stokesncnilocalresidual.hh
deleted file mode 100644
index e91d0e376e9af562473f60fdf32bbc6a2941ce77..0000000000000000000000000000000000000000
--- a/dumux/freeflow/stokesncni/stokesncnilocalresidual.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_STOKESNCNI_LOCAL_RESIDUAL_HH_OLD
-#define DUMUX_STOKESNCNI_LOCAL_RESIDUAL_HH_OLD
-
-#warning this header is deprecated, use dumux/freeflow/stokesncni/localresidual.hh instead
-
-#include <dumux/freeflow/stokesncni/localresidual.hh>
-
-#endif
diff --git a/dumux/freeflow/stokesncni/stokesncnimodel.hh b/dumux/freeflow/stokesncni/stokesncnimodel.hh
deleted file mode 100644
index 0f2d54e4e8c2d54ac4e0974033259d0db31dcf75..0000000000000000000000000000000000000000
--- a/dumux/freeflow/stokesncni/stokesncnimodel.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_STOKESNCNI_MODEL_HH_OLD
-#define DUMUX_STOKESNCNI_MODEL_HH_OLD
-
-#warning this header is deprecated, use dumux/freeflow/stokesncni/model.hh instead
-
-#include <dumux/freeflow/stokesncni/model.hh>
-
-#endif
diff --git a/dumux/freeflow/stokesncni/stokesncniproperties.hh b/dumux/freeflow/stokesncni/stokesncniproperties.hh
deleted file mode 100644
index 6a20ea4c0a3696e8140e109823823ecddfa3b168..0000000000000000000000000000000000000000
--- a/dumux/freeflow/stokesncni/stokesncniproperties.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_STOKESNCNI_PROPERTIES_HH_OLD
-#define DUMUX_STOKESNCNI_PROPERTIES_HH_OLD
-
-#warning this header is deprecated, use dumux/freeflow/stokesncni/properties.hh instead
-
-#include <dumux/freeflow/stokesncni/properties.hh>
-
-#endif
diff --git a/dumux/freeflow/stokesncni/stokesncnipropertydefaults.hh b/dumux/freeflow/stokesncni/stokesncnipropertydefaults.hh
deleted file mode 100644
index d2add957992b16adfe6acbf13f889e72cd84be93..0000000000000000000000000000000000000000
--- a/dumux/freeflow/stokesncni/stokesncnipropertydefaults.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_STOKESNCNI_PROPERTY_DEFAULTS_HH_OLD
-#define DUMUX_STOKESNCNI_PROPERTY_DEFAULTS_HH_OLD
-
-#warning this header is deprecated, use dumux/freeflow/stokesncni/propertydefaults.hh instead
-
-#include <dumux/freeflow/stokesncni/propertydefaults.hh>
-
-#endif
diff --git a/dumux/freeflow/stokesncni/stokesncnivolumevariables.hh b/dumux/freeflow/stokesncni/stokesncnivolumevariables.hh
deleted file mode 100644
index fbe018811602ef9340e02022ea01310d67d8778e..0000000000000000000000000000000000000000
--- a/dumux/freeflow/stokesncni/stokesncnivolumevariables.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_STOKESNCNI_VOLUME_VARIABLES_HH_OLD
-#define DUMUX_STOKESNCNI_VOLUME_VARIABLES_HH_OLD
-
-#warning this header is deprecated, use dumux/freeflow/stokesncni/volumevariables.hh instead
-
-#include <dumux/freeflow/stokesncni/volumevariables.hh>
-
-#endif
diff --git a/dumux/freeflow/zeroeq/CMakeLists.txt b/dumux/freeflow/zeroeq/CMakeLists.txt
index cb4ec38429bdbfbda4b33b2fd5e67dfa70926c13..ec40c05bbcd8f012f524afd919e32c02e0e05c08 100644
--- a/dumux/freeflow/zeroeq/CMakeLists.txt
+++ b/dumux/freeflow/zeroeq/CMakeLists.txt
@@ -1,12 +1,6 @@
 
 #install headers
 install(FILES
-zeroeqfluxvariables.hh
-zeroeqindices.hh
-zeroeqmodel.hh
-zeroeqproblem.hh
-zeroeqproperties.hh
-zeroeqpropertydefaults.hh
 fluxvariables.hh
 indices.hh
 model.hh
diff --git a/dumux/freeflow/zeroeq/zeroeqfluxvariables.hh b/dumux/freeflow/zeroeq/zeroeqfluxvariables.hh
deleted file mode 100644
index dac3755571582a2197450d939a2222a92f40d944..0000000000000000000000000000000000000000
--- a/dumux/freeflow/zeroeq/zeroeqfluxvariables.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_ZEROEQ_FLUX_VARIABLES_HH_OLD
-#define DUMUX_ZEROEQ_FLUX_VARIABLES_HH_OLD
-
-#warning this header is deprecated, use dumux/freeflow/zeroeq/fluxvariables.hh instead
-
-#include <dumux/freeflow/zeroeq/fluxvariables.hh>
-
-#endif
diff --git a/dumux/freeflow/zeroeq/zeroeqindices.hh b/dumux/freeflow/zeroeq/zeroeqindices.hh
deleted file mode 100644
index f69375869dc4de463bc32c1c98b7221fae5e5331..0000000000000000000000000000000000000000
--- a/dumux/freeflow/zeroeq/zeroeqindices.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_ZEROEQ_INDICES_HH_OLD
-#define DUMUX_ZEROEQ_INDICES_HH_OLD
-
-#warning this header is deprecated, use dumux/freeflow/zeroeq/indices.hh instead
-
-#include <dumux/freeflow/zeroeq/indices.hh>
-
-#endif
diff --git a/dumux/freeflow/zeroeq/zeroeqmodel.hh b/dumux/freeflow/zeroeq/zeroeqmodel.hh
deleted file mode 100644
index d3fe0da958e4550f788ec2c4232dd936338d34ae..0000000000000000000000000000000000000000
--- a/dumux/freeflow/zeroeq/zeroeqmodel.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_ZEROEQ_MODEL_HH_OLD
-#define DUMUX_ZEROEQ_MODEL_HH_OLD
-
-#warning this header is deprecated, use dumux/freeflow/zeroeq/model.hh instead
-
-#include <dumux/freeflow/zeroeq/model.hh>
-
-#endif
diff --git a/dumux/freeflow/zeroeq/zeroeqproblem.hh b/dumux/freeflow/zeroeq/zeroeqproblem.hh
deleted file mode 100644
index 2807e5984baee721f63a4fe17805294edfae234c..0000000000000000000000000000000000000000
--- a/dumux/freeflow/zeroeq/zeroeqproblem.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_ZEROEQ_PROBLEM_HH_OLD
-#define DUMUX_ZEROEQ_PROBLEM_HH_OLD
-
-#warning this header is deprecated, use dumux/freeflow/zeroeq/problem.hh instead
-
-#include <dumux/freeflow/zeroeq/problem.hh>
-
-#endif
diff --git a/dumux/freeflow/zeroeq/zeroeqproperties.hh b/dumux/freeflow/zeroeq/zeroeqproperties.hh
deleted file mode 100644
index d3d2d8df69a74c83cd864a5a528c7d2a2081fa40..0000000000000000000000000000000000000000
--- a/dumux/freeflow/zeroeq/zeroeqproperties.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_ZEROEQ_PROPERTIES_HH_OLD
-#define DUMUX_ZEROEQ_PROPERTIES_HH_OLD
-
-#warning this header is deprecated, use dumux/freeflow/zeroeq/properties.hh instead
-
-#include <dumux/freeflow/zeroeq/properties.hh>
-
-#endif
diff --git a/dumux/freeflow/zeroeq/zeroeqpropertydefaults.hh b/dumux/freeflow/zeroeq/zeroeqpropertydefaults.hh
deleted file mode 100644
index 3d4daaf6224dbdd40706a40eee55cf274c69651b..0000000000000000000000000000000000000000
--- a/dumux/freeflow/zeroeq/zeroeqpropertydefaults.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_ZEROEQ_PROPERTY_DEFAULTS_HH_OLD
-#define DUMUX_ZEROEQ_PROPERTY_DEFAULTS_HH_OLD
-
-#warning this header is deprecated, use dumux/freeflow/zeroeq/propertydefaults.hh instead
-
-#include <dumux/freeflow/zeroeq/propertydefaults.hh>
-
-#endif
diff --git a/dumux/freeflow/zeroeqnc/CMakeLists.txt b/dumux/freeflow/zeroeqnc/CMakeLists.txt
index 9d63c29e5abd9414aac2987b5232dac85ae5e06b..9204038589b2cfd1a347cfef6411535fada19860 100644
--- a/dumux/freeflow/zeroeqnc/CMakeLists.txt
+++ b/dumux/freeflow/zeroeqnc/CMakeLists.txt
@@ -1,11 +1,6 @@
 
 #install headers
 install(FILES
-zeroeqncfluxvariables.hh
-zeroeqncindices.hh
-zeroeqncmodel.hh
-zeroeqncproperties.hh
-zeroeqncpropertydefaults.hh
 fluxvariables.hh
 indices.hh
 model.hh
diff --git a/dumux/freeflow/zeroeqnc/zeroeqncfluxvariables.hh b/dumux/freeflow/zeroeqnc/zeroeqncfluxvariables.hh
deleted file mode 100644
index 1ddd1dd62eed7ed723dfd06fb22790f32967af29..0000000000000000000000000000000000000000
--- a/dumux/freeflow/zeroeqnc/zeroeqncfluxvariables.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_ZEROEQNC_FLUX_VARIABLES_HH_OLD
-#define DUMUX_ZEROEQNC_FLUX_VARIABLES_HH_OLD
-
-#warning this header is deprecated, use dumux/freeflow/zeroeqnc/fluxvariables.hh instead
-
-#include <dumux/freeflow/zeroeqnc/fluxvariables.hh>
-
-#endif
diff --git a/dumux/freeflow/zeroeqnc/zeroeqncindices.hh b/dumux/freeflow/zeroeqnc/zeroeqncindices.hh
deleted file mode 100644
index 455330b93fd3040e4b4abc238bec282629b0d461..0000000000000000000000000000000000000000
--- a/dumux/freeflow/zeroeqnc/zeroeqncindices.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_ZEROEQNC_INDICES_HH_OLD
-#define DUMUX_ZEROEQNC_INDICES_HH_OLD
-
-#warning this header is deprecated, use dumux/freeflow/zeroeqnc/indices.hh instead
-
-#include <dumux/freeflow/zeroeqnc/indices.hh>
-
-#endif
diff --git a/dumux/freeflow/zeroeqnc/zeroeqncmodel.hh b/dumux/freeflow/zeroeqnc/zeroeqncmodel.hh
deleted file mode 100644
index ad6949811722a776fed5187915f0d26d05cdc302..0000000000000000000000000000000000000000
--- a/dumux/freeflow/zeroeqnc/zeroeqncmodel.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_ZEROEQNC_MODEL_HH_OLD
-#define DUMUX_ZEROEQNC_MODEL_HH_OLD
-
-#warning this header is deprecated, use dumux/freeflow/zeroeqnc/model.hh instead
-
-#include <dumux/freeflow/zeroeqnc/model.hh>
-
-#endif
diff --git a/dumux/freeflow/zeroeqnc/zeroeqncproperties.hh b/dumux/freeflow/zeroeqnc/zeroeqncproperties.hh
deleted file mode 100644
index 8a9c3aeee2a991b157d4f3f295caf848c9810d2c..0000000000000000000000000000000000000000
--- a/dumux/freeflow/zeroeqnc/zeroeqncproperties.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_ZEROEQNC_PROPERTIES_HH_OLD
-#define DUMUX_ZEROEQNC_PROPERTIES_HH_OLD
-
-#warning this header is deprecated, use dumux/freeflow/zeroeqnc/properties.hh instead
-
-#include <dumux/freeflow/zeroeqnc/properties.hh>
-
-#endif
diff --git a/dumux/freeflow/zeroeqnc/zeroeqncpropertydefaults.hh b/dumux/freeflow/zeroeqnc/zeroeqncpropertydefaults.hh
deleted file mode 100644
index 84843cb0aaff314b523e59473c6ea64170882b38..0000000000000000000000000000000000000000
--- a/dumux/freeflow/zeroeqnc/zeroeqncpropertydefaults.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_ZEROEQNC_PROPERTY_DEFAULTS_HH_OLD
-#define DUMUX_ZEROEQNC_PROPERTY_DEFAULTS_HH_OLD
-
-#warning this header is deprecated, use dumux/freeflow/zeroeqnc/propertydefaults.hh instead
-
-#include <dumux/freeflow/zeroeqnc/propertydefaults.hh>
-
-#endif
diff --git a/dumux/freeflow/zeroeqncni/CMakeLists.txt b/dumux/freeflow/zeroeqncni/CMakeLists.txt
index 8bdfc1ed7a27c50405cb9ef5fe33597d07462488..b853f50b6f923c60f4e848dc667259fdd30ccef3 100644
--- a/dumux/freeflow/zeroeqncni/CMakeLists.txt
+++ b/dumux/freeflow/zeroeqncni/CMakeLists.txt
@@ -1,11 +1,6 @@
 
 #install headers
 install(FILES
-zeroeqncnifluxvariables.hh
-zeroeqncniindices.hh
-zeroeqncnimodel.hh
-zeroeqncniproperties.hh
-zeroeqncnipropertydefaults.hh
 fluxvariables.hh
 indices.hh
 model.hh
diff --git a/dumux/freeflow/zeroeqncni/zeroeqncnifluxvariables.hh b/dumux/freeflow/zeroeqncni/zeroeqncnifluxvariables.hh
deleted file mode 100644
index 4c80a8c685608d99ca9d3df17665bb741f8400ef..0000000000000000000000000000000000000000
--- a/dumux/freeflow/zeroeqncni/zeroeqncnifluxvariables.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_ZEROEQNCNI_FLUX_VARIABLES_HH_OLD
-#define DUMUX_ZEROEQNCNI_FLUX_VARIABLES_HH_OLD
-
-#warning this header is deprecated, use dumux/freeflow/zeroeqncni/fluxvariables.hh instead
-
-#include <dumux/freeflow/zeroeqncni/fluxvariables.hh>
-
-#endif
diff --git a/dumux/freeflow/zeroeqncni/zeroeqncniindices.hh b/dumux/freeflow/zeroeqncni/zeroeqncniindices.hh
deleted file mode 100644
index af1150d979489f6c43cf5c889ac84a9a5b93e8d7..0000000000000000000000000000000000000000
--- a/dumux/freeflow/zeroeqncni/zeroeqncniindices.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_ZEROEQNCNI_INDICES_HH_OLD
-#define DUMUX_ZEROEQNCNI_INDICES_HH_OLD
-
-#warning this header is deprecated, use dumux/freeflow/zeroeqncni/indices.hh instead
-
-#include <dumux/freeflow/zeroeqncni/indices.hh>
-
-#endif
diff --git a/dumux/freeflow/zeroeqncni/zeroeqncnimodel.hh b/dumux/freeflow/zeroeqncni/zeroeqncnimodel.hh
deleted file mode 100644
index fd0f40f365046b64fdb6d84c6ef669d220788f17..0000000000000000000000000000000000000000
--- a/dumux/freeflow/zeroeqncni/zeroeqncnimodel.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_ZEROEQNCNI_MODEL_HH_OLD
-#define DUMUX_ZEROEQNCNI_MODEL_HH_OLD
-
-#warning this header is deprecated, use dumux/freeflow/zeroeqncni/model.hh instead
-
-#include <dumux/freeflow/zeroeqncni/model.hh>
-
-#endif
diff --git a/dumux/freeflow/zeroeqncni/zeroeqncniproperties.hh b/dumux/freeflow/zeroeqncni/zeroeqncniproperties.hh
deleted file mode 100644
index f2bbf3ea4a8d3ca86e40689119bbbe54d75064b2..0000000000000000000000000000000000000000
--- a/dumux/freeflow/zeroeqncni/zeroeqncniproperties.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_ZEROEQNCNI_PROPERTIES_HH_OLD
-#define DUMUX_ZEROEQNCNI_PROPERTIES_HH_OLD
-
-#warning this header is deprecated, use dumux/freeflow/zeroeqncni/properties.hh instead
-
-#include <dumux/freeflow/zeroeqncni/properties.hh>
-
-#endif
diff --git a/dumux/freeflow/zeroeqncni/zeroeqncnipropertydefaults.hh b/dumux/freeflow/zeroeqncni/zeroeqncnipropertydefaults.hh
deleted file mode 100644
index 4545ca6ed174b3015a21a0c672218830d67055dd..0000000000000000000000000000000000000000
--- a/dumux/freeflow/zeroeqncni/zeroeqncnipropertydefaults.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_ZEROEQNCNI_PROPERTY_DEFAULTS_HH_OLD
-#define DUMUX_ZEROEQNCNI_PROPERTY_DEFAULTS_HH_OLD
-
-#warning this header is deprecated, use dumux/freeflow/zeroeqncni/propertydefaults.hh instead
-
-#include <dumux/freeflow/zeroeqncni/propertydefaults.hh>
-
-#endif
diff --git a/dumux/geomechanics/el1p2c/CMakeLists.txt b/dumux/geomechanics/el1p2c/CMakeLists.txt
index d6d37d0ed706dce9671e6a1750fab33966fe3602..b1d385c69a89719def138462fc0a42ce5cc3c9ff 100644
--- a/dumux/geomechanics/el1p2c/CMakeLists.txt
+++ b/dumux/geomechanics/el1p2c/CMakeLists.txt
@@ -1,15 +1,6 @@
 
 #install headers
 install(FILES
-el1p2celementvolumevariables.hh
-el1p2cfluxvariables.hh
-el1p2cindices.hh
-el1p2clocaljacobian.hh
-el1p2clocalresidual.hh
-el1p2cmodel.hh
-el1p2cproperties.hh
-el1p2cpropertydefaults.hh
-el1p2cvolumevariables.hh
 elementvolumevariables.hh
 fluxvariables.hh
 indices.hh
diff --git a/dumux/geomechanics/el1p2c/el1p2celementvolumevariables.hh b/dumux/geomechanics/el1p2c/el1p2celementvolumevariables.hh
deleted file mode 100644
index aa9f9ce86b529c886f8e0f5e34a6bf8269c5f4cf..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/el1p2c/el1p2celementvolumevariables.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_BOX_EL1P2C_ELEMENT_VOLUME_VARIABLES_HH_OLD
-#define DUMUX_BOX_EL1P2C_ELEMENT_VOLUME_VARIABLES_HH_OLD
-
-#warning this header is deprecated, use dumux/geomechanics/el1p2c/elementvolumevariables.hh instead
-
-#include <dumux/geomechanics/el1p2c/elementvolumevariables.hh>
-
-#endif
diff --git a/dumux/geomechanics/el1p2c/el1p2cfluxvariables.hh b/dumux/geomechanics/el1p2c/el1p2cfluxvariables.hh
deleted file mode 100644
index 6ed09870c80bce535d5b3d1aacffaa0f8aa6df80..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/el1p2c/el1p2cfluxvariables.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_ELASTIC1P2C_FLUX_VARIABLES_HH_OLD
-#define DUMUX_ELASTIC1P2C_FLUX_VARIABLES_HH_OLD
-
-#warning this header is deprecated, use dumux/geomechanics/el1p2c/fluxvariables.hh instead
-
-#include <dumux/geomechanics/el1p2c/fluxvariables.hh>
-
-#endif
diff --git a/dumux/geomechanics/el1p2c/el1p2cindices.hh b/dumux/geomechanics/el1p2c/el1p2cindices.hh
deleted file mode 100644
index aad2de0ddf292ca0a63eb910529c504066a06788..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/el1p2c/el1p2cindices.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_ELASTIC1P2C_INDICES_HH_OLD
-#define DUMUX_ELASTIC1P2C_INDICES_HH_OLD
-
-#warning this header is deprecated, use dumux/geomechanics/el1p2c/indices.hh instead
-
-#include <dumux/geomechanics/el1p2c/indices.hh>
-
-#endif
diff --git a/dumux/geomechanics/el1p2c/el1p2clocaljacobian.hh b/dumux/geomechanics/el1p2c/el1p2clocaljacobian.hh
deleted file mode 100644
index 816459cc8bd44dd3679cfa4ed8be644769f1d220..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/el1p2c/el1p2clocaljacobian.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_EL1P2C_LOCAL_JACOBIAN_HH_OLD
-#define DUMUX_EL1P2C_LOCAL_JACOBIAN_HH_OLD
-
-#warning this header is deprecated, use dumux/geomechanics/el1p2c/localjacobian.hh instead
-
-#include <dumux/geomechanics/el1p2c/localjacobian.hh>
-
-#endif
diff --git a/dumux/geomechanics/el1p2c/el1p2clocalresidual.hh b/dumux/geomechanics/el1p2c/el1p2clocalresidual.hh
deleted file mode 100644
index 1fa9d64fbbffb7c407ebfb47d7b407dac0767f7f..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/el1p2c/el1p2clocalresidual.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_ELASTIC1P2C_LOCAL_RESIDUAL_HH_OLD
-#define DUMUX_ELASTIC1P2C_LOCAL_RESIDUAL_HH_OLD
-
-#warning this header is deprecated, use dumux/geomechanics/el1p2c/localresidual.hh instead
-
-#include <dumux/geomechanics/el1p2c/localresidual.hh>
-
-#endif
diff --git a/dumux/geomechanics/el1p2c/el1p2cmodel.hh b/dumux/geomechanics/el1p2c/el1p2cmodel.hh
deleted file mode 100644
index 3294ac54ca2bf72fd5dcf6e5fc7f7b8a75e97cc0..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/el1p2c/el1p2cmodel.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_ELASTIC1P2C_MODEL_HH_OLD
-#define DUMUX_ELASTIC1P2C_MODEL_HH_OLD
-
-#warning this header is deprecated, use dumux/geomechanics/el1p2c/model.hh instead
-
-#include <dumux/geomechanics/el1p2c/model.hh>
-
-#endif
diff --git a/dumux/geomechanics/el1p2c/el1p2cproperties.hh b/dumux/geomechanics/el1p2c/el1p2cproperties.hh
deleted file mode 100644
index 2d26172b8c58cd2e3124e18dc267fb2cb0350994..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/el1p2c/el1p2cproperties.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_ELASTIC1P2C_PROPERTIES_HH_OLD
-#define DUMUX_ELASTIC1P2C_PROPERTIES_HH_OLD
-
-#warning this header is deprecated, use dumux/geomechanics/el1p2c/properties.hh instead
-
-#include <dumux/geomechanics/el1p2c/properties.hh>
-
-#endif
diff --git a/dumux/geomechanics/el1p2c/el1p2cpropertydefaults.hh b/dumux/geomechanics/el1p2c/el1p2cpropertydefaults.hh
deleted file mode 100644
index 1466b574cb7c7f71bc39ba786bb117619487875b..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/el1p2c/el1p2cpropertydefaults.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_ELASTIC1P2C_PROPERTY_DEFAULTS_HH_OLD
-#define DUMUX_ELASTIC1P2C_PROPERTY_DEFAULTS_HH_OLD
-
-#warning this header is deprecated, use dumux/geomechanics/el1p2c/propertydefaults.hh instead
-
-#include <dumux/geomechanics/el1p2c/propertydefaults.hh>
-
-#endif
diff --git a/dumux/geomechanics/el1p2c/el1p2cvolumevariables.hh b/dumux/geomechanics/el1p2c/el1p2cvolumevariables.hh
deleted file mode 100644
index 336535500f92e01509b463046d454b99c99e9eb5..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/el1p2c/el1p2cvolumevariables.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_ELASTIC1P2C_VOLUME_VARIABLES_HH_OLD
-#define DUMUX_ELASTIC1P2C_VOLUME_VARIABLES_HH_OLD
-
-#warning this header is deprecated, use dumux/geomechanics/el1p2c/volumevariables.hh instead
-
-#include <dumux/geomechanics/el1p2c/volumevariables.hh>
-
-#endif
diff --git a/dumux/geomechanics/el2p/CMakeLists.txt b/dumux/geomechanics/el2p/CMakeLists.txt
index 08e1adee28c5f9b0a1d56e0567ac87004f1d3604..ab8c45b2f6cef4a4c01bb847084eb43e93e82bd9 100644
--- a/dumux/geomechanics/el2p/CMakeLists.txt
+++ b/dumux/geomechanics/el2p/CMakeLists.txt
@@ -1,20 +1,6 @@
 
 #install headers
 install(FILES
-el2pamgbackend.hh
-el2passembler.hh
-el2pbasemodel.hh
-el2pelementvolumevariables.hh
-el2pfluxvariables.hh
-el2pindices.hh
-el2plocaljacobian.hh
-el2plocaloperator.hh
-el2plocalresidual.hh
-el2pmodel.hh
-el2pnewtoncontroller.hh
-el2pproperties.hh
-el2ppropertydefaults.hh
-el2pvolumevariables.hh
 amgbackend.hh
 assembler.hh
 basemodel.hh
diff --git a/dumux/geomechanics/el2p/el2pamgbackend.hh b/dumux/geomechanics/el2p/el2pamgbackend.hh
deleted file mode 100644
index a0de251574a94418d2789cbd7472fb4872bb45f0..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/el2p/el2pamgbackend.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_EL2P_AMGBACKEND_HH_OLD
-#define DUMUX_EL2P_AMGBACKEND_HH_OLD
-
-#warning this header is deprecated, use dumux/geomechanics/el2p/amgbackend.hh instead
-
-#include <dumux/geomechanics/el2p/amgbackend.hh>
-
-#endif
diff --git a/dumux/geomechanics/el2p/el2passembler.hh b/dumux/geomechanics/el2p/el2passembler.hh
deleted file mode 100644
index bdf94c449faa5dde4b113888ee5868b6f0480e22..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/el2p/el2passembler.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_EL2P_ASSEMBLER_HH_OLD
-#define DUMUX_EL2P_ASSEMBLER_HH_OLD
-
-#warning this header is deprecated, use dumux/geomechanics/el2p/assembler.hh instead
-
-#include <dumux/geomechanics/el2p/assembler.hh>
-
-#endif
diff --git a/dumux/geomechanics/el2p/el2pbasemodel.hh b/dumux/geomechanics/el2p/el2pbasemodel.hh
deleted file mode 100644
index 83f6185f3f84320939284381a4bf0c60461af84c..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/el2p/el2pbasemodel.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_ELASTIC2P_BASE_MODEL_HH_OLD
-#define DUMUX_ELASTIC2P_BASE_MODEL_HH_OLD
-
-#warning this header is deprecated, use dumux/geomechanics/el2p/basemodel.hh instead
-
-#include <dumux/geomechanics/el2p/basemodel.hh>
-
-#endif
diff --git a/dumux/geomechanics/el2p/el2pelementvolumevariables.hh b/dumux/geomechanics/el2p/el2pelementvolumevariables.hh
deleted file mode 100644
index 34a95941be2daf10d9e5991394e0b2b6152a7a7e..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/el2p/el2pelementvolumevariables.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_BOX_EL2P_ELEMENT_VOLUME_VARIABLES_HH_OLD
-#define DUMUX_BOX_EL2P_ELEMENT_VOLUME_VARIABLES_HH_OLD
-
-#warning this header is deprecated, use dumux/geomechanics/el2p/elementvolumevariables.hh instead
-
-#include <dumux/geomechanics/el2p/elementvolumevariables.hh>
-
-#endif
diff --git a/dumux/geomechanics/el2p/el2pfluxvariables.hh b/dumux/geomechanics/el2p/el2pfluxvariables.hh
deleted file mode 100644
index 75eae8897ae5b0b00a45788e8336fce667f3552d..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/el2p/el2pfluxvariables.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_EL2P_FLUX_VARIABLES_HH_OLD
-#define DUMUX_EL2P_FLUX_VARIABLES_HH_OLD
-
-#warning this header is deprecated, use dumux/geomechanics/el2p/fluxvariables.hh instead
-
-#include <dumux/geomechanics/el2p/fluxvariables.hh>
-
-#endif
diff --git a/dumux/geomechanics/el2p/el2pindices.hh b/dumux/geomechanics/el2p/el2pindices.hh
deleted file mode 100644
index 0c824cdda8fc97f4ee94cfaffddccda34557bab8..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/el2p/el2pindices.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_ELASTIC2P_INDICES_HH_OLD
-#define DUMUX_ELASTIC2P_INDICES_HH_OLD
-
-#warning this header is deprecated, use dumux/geomechanics/el2p/indices.hh instead
-
-#include <dumux/geomechanics/el2p/indices.hh>
-
-#endif
diff --git a/dumux/geomechanics/el2p/el2plocaljacobian.hh b/dumux/geomechanics/el2p/el2plocaljacobian.hh
deleted file mode 100644
index 916c6704b6e1cf4c427aeb5693f5f77ecd8d96c0..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/el2p/el2plocaljacobian.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_EL2P_LOCAL_JACOBIAN_HH_OLD
-#define DUMUX_EL2P_LOCAL_JACOBIAN_HH_OLD
-
-#warning this header is deprecated, use dumux/geomechanics/el2p/localjacobian.hh instead
-
-#include <dumux/geomechanics/el2p/localjacobian.hh>
-
-#endif
diff --git a/dumux/geomechanics/el2p/el2plocaloperator.hh b/dumux/geomechanics/el2p/el2plocaloperator.hh
deleted file mode 100644
index 4ec5a64715961432df0d96777890f185bb11cc17..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/el2p/el2plocaloperator.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_EL2P_LOCAL_OPERATOR_HH_OLD
-#define DUMUX_EL2P_LOCAL_OPERATOR_HH_OLD
-
-#warning this header is deprecated, use dumux/geomechanics/el2p/localoperator.hh instead
-
-#include <dumux/geomechanics/el2p/localoperator.hh>
-
-#endif
diff --git a/dumux/geomechanics/el2p/el2plocalresidual.hh b/dumux/geomechanics/el2p/el2plocalresidual.hh
deleted file mode 100644
index e6cf28856cb5d4a1e410af090ab1308399879519..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/el2p/el2plocalresidual.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_ELASTIC2P_LOCAL_RESIDUAL_HH_OLD
-#define DUMUX_ELASTIC2P_LOCAL_RESIDUAL_HH_OLD
-
-#warning this header is deprecated, use dumux/geomechanics/el2p/localresidual.hh instead
-
-#include <dumux/geomechanics/el2p/localresidual.hh>
-
-#endif
diff --git a/dumux/geomechanics/el2p/el2pmodel.hh b/dumux/geomechanics/el2p/el2pmodel.hh
deleted file mode 100644
index c3d2ffb9bb351539dd07ba72a21c96a92aff0c87..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/el2p/el2pmodel.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_ELASTIC2P_MODEL_HH_OLD
-#define DUMUX_ELASTIC2P_MODEL_HH_OLD
-
-#warning this header is deprecated, use dumux/geomechanics/el2p/model.hh instead
-
-#include <dumux/geomechanics/el2p/model.hh>
-
-#endif
diff --git a/dumux/geomechanics/el2p/el2pnewtoncontroller.hh b/dumux/geomechanics/el2p/el2pnewtoncontroller.hh
deleted file mode 100644
index debec503983ff439cc5e8562e15dbf395534f84b..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/el2p/el2pnewtoncontroller.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_EL2P_NEWTON_CONTROLLER_HH_OLD
-#define DUMUX_EL2P_NEWTON_CONTROLLER_HH_OLD
-
-#warning this header is deprecated, use dumux/geomechanics/el2p/newtoncontroller.hh instead
-
-#include <dumux/geomechanics/el2p/newtoncontroller.hh>
-
-#endif
diff --git a/dumux/geomechanics/el2p/el2pproperties.hh b/dumux/geomechanics/el2p/el2pproperties.hh
deleted file mode 100644
index 615f3fe5dda4295f73ed6cbff84e0da7f1523bd8..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/el2p/el2pproperties.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_ELASTIC2P_PROPERTIES_HH_OLD
-#define DUMUX_ELASTIC2P_PROPERTIES_HH_OLD
-
-#warning this header is deprecated, use dumux/geomechanics/el2p/properties.hh instead
-
-#include <dumux/geomechanics/el2p/properties.hh>
-
-#endif
diff --git a/dumux/geomechanics/el2p/el2ppropertydefaults.hh b/dumux/geomechanics/el2p/el2ppropertydefaults.hh
deleted file mode 100644
index a2470dbc649ce31fe01d90112562bff36f179546..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/el2p/el2ppropertydefaults.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_ELASTIC2P_PROPERTY_DEFAULTS_HH_OLD
-#define DUMUX_ELASTIC2P_PROPERTY_DEFAULTS_HH_OLD
-
-#warning this header is deprecated, use dumux/geomechanics/el2p/propertydefaults.hh instead
-
-#include <dumux/geomechanics/el2p/propertydefaults.hh>
-
-#endif
diff --git a/dumux/geomechanics/el2p/el2pvolumevariables.hh b/dumux/geomechanics/el2p/el2pvolumevariables.hh
deleted file mode 100644
index 75c66590c5fff40eb734bad13e023f91f9bd6f16..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/el2p/el2pvolumevariables.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_ELASTIC2P_VOLUME_VARIABLES_HH_OLD
-#define DUMUX_ELASTIC2P_VOLUME_VARIABLES_HH_OLD
-
-#warning this header is deprecated, use dumux/geomechanics/el2p/volumevariables.hh instead
-
-#include <dumux/geomechanics/el2p/volumevariables.hh>
-
-#endif
diff --git a/dumux/geomechanics/elastic/CMakeLists.txt b/dumux/geomechanics/elastic/CMakeLists.txt
index a0c57de975c8fc86f7df5d5b00e815bdf572f083..dc2edada4ebdd7cfe64a373f57d427b4a419fbb0 100644
--- a/dumux/geomechanics/elastic/CMakeLists.txt
+++ b/dumux/geomechanics/elastic/CMakeLists.txt
@@ -1,13 +1,6 @@
 
 #install headers
 install(FILES
-elasticfluxvariables.hh
-elasticindices.hh
-elasticlocalresidual.hh
-elasticmodel.hh
-elasticproperties.hh
-elasticpropertydefaults.hh
-elasticvolumevariables.hh
 fluxvariables.hh
 indices.hh
 localresidual.hh
diff --git a/dumux/geomechanics/elastic/elasticfluxvariables.hh b/dumux/geomechanics/elastic/elasticfluxvariables.hh
deleted file mode 100644
index ae4e878db31bf5e13f756bd26c881cdb2b0f746d..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/elastic/elasticfluxvariables.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_ELASTIC_FLUX_VARIABLES_HH_OLD
-#define DUMUX_ELASTIC_FLUX_VARIABLES_HH_OLD
-
-#warning this header is deprecated, use dumux/geomechanics/elastic/fluxvariables.hh instead
-
-#include <dumux/geomechanics/elastic/fluxvariables.hh>
-
-#endif
diff --git a/dumux/geomechanics/elastic/elasticindices.hh b/dumux/geomechanics/elastic/elasticindices.hh
deleted file mode 100644
index ff5f5227c9ce957db97fbad72cfa99dfaa99f65d..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/elastic/elasticindices.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_ELASTIC_INDICES_HH_OLD
-#define DUMUX_ELASTIC_INDICES_HH_OLD
-
-#warning this header is deprecated, use dumux/geomechanics/elastic/indices.hh instead
-
-#include <dumux/geomechanics/elastic/indices.hh>
-
-#endif
diff --git a/dumux/geomechanics/elastic/elasticlocalresidual.hh b/dumux/geomechanics/elastic/elasticlocalresidual.hh
deleted file mode 100644
index e3eae2e1d3c7aa84c78398ff3ec063986ed59337..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/elastic/elasticlocalresidual.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_ELASTIC_LOCAL_RESIDUAL_HH_OLD
-#define DUMUX_ELASTIC_LOCAL_RESIDUAL_HH_OLD
-
-#warning this header is deprecated, use dumux/geomechanics/elastic/localresidual.hh instead
-
-#include <dumux/geomechanics/elastic/localresidual.hh>
-
-#endif
diff --git a/dumux/geomechanics/elastic/elasticmodel.hh b/dumux/geomechanics/elastic/elasticmodel.hh
deleted file mode 100644
index 59ea49c67b66c3b6dbe9ef44d9b9b678a103e29e..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/elastic/elasticmodel.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_ELASTIC_MODEL_HH_OLD
-#define DUMUX_ELASTIC_MODEL_HH_OLD
-
-#warning this header is deprecated, use dumux/geomechanics/elastic/model.hh instead
-
-#include <dumux/geomechanics/elastic/model.hh>
-
-#endif
diff --git a/dumux/geomechanics/elastic/elasticproperties.hh b/dumux/geomechanics/elastic/elasticproperties.hh
deleted file mode 100644
index 18f9fe581241afe0ae1c9ee45cecba5c87dc661c..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/elastic/elasticproperties.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_ELASTIC_PROPERTIES_HH_OLD
-#define DUMUX_ELASTIC_PROPERTIES_HH_OLD
-
-#warning this header is deprecated, use dumux/geomechanics/elastic/properties.hh instead
-
-#include <dumux/geomechanics/elastic/properties.hh>
-
-#endif
diff --git a/dumux/geomechanics/elastic/elasticpropertydefaults.hh b/dumux/geomechanics/elastic/elasticpropertydefaults.hh
deleted file mode 100644
index 28611246163f5df61802fdb213d2ab4c9f910e6b..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/elastic/elasticpropertydefaults.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_ELASTIC_PROPERTIES_DEFAULTS_HH_OLD
-#define DUMUX_ELASTIC_PROPERTIES_DEFAULTS_HH_OLD
-
-#warning this header is deprecated, use dumux/geomechanics/elastic/propertydefaults.hh instead
-
-#include <dumux/geomechanics/elastic/propertydefaults.hh>
-
-#endif
diff --git a/dumux/geomechanics/elastic/elasticvolumevariables.hh b/dumux/geomechanics/elastic/elasticvolumevariables.hh
deleted file mode 100644
index 468776bc8e40d65ad3da71a83458424a813c21f2..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/elastic/elasticvolumevariables.hh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DUMUX_ELASTIC_VOLUME_VARIABLES_HH_OLD
-#define DUMUX_ELASTIC_VOLUME_VARIABLES_HH_OLD
-
-#warning this header is deprecated, use dumux/geomechanics/elastic/volumevariables.hh instead
-
-#include <dumux/geomechanics/elastic/volumevariables.hh>
-
-#endif