diff --git a/dumux/common/intersectionmapper.hh b/dumux/common/intersectionmapper.hh
index 04cd6192378dac1d8800c97037843ff49c8f35e2..df7849a843ca0d15e8d567b940c84bb1e791a6cd 100644
--- a/dumux/common/intersectionmapper.hh
+++ b/dumux/common/intersectionmapper.hh
@@ -190,7 +190,7 @@ class IntersectionMapper
 #if DUNE_VERSION_NEWER(DUNE_COMMON,2,6)
     using ElementMapper = Dune::MultipleCodimMultipleGeomTypeMapper<GridView>;
 #else
-    typedef Dune::MultipleCodimMultipleGeomTypeMapper<GridView, Dune::MCMGElementLayout> ElementMapper;
+    using ElementMapper = Dune::MultipleCodimMultipleGeomTypeMapper<GridView, Dune::MCMGElementLayout>;
 #endif
 
 public:
diff --git a/dumux/implicit/problem.hh b/dumux/implicit/problem.hh
index fbd14884fbf7ed59aff80254f11271509ffb087e..1b12e536bc7cdda2e39d7d27bd97632cc6bc3475 100644
--- a/dumux/implicit/problem.hh
+++ b/dumux/implicit/problem.hh
@@ -100,27 +100,21 @@ public:
      * \param timeManager The TimeManager which is used by the simulation
      * \param gridView The simulation's idea about physical space
      */
-#if DUNE_VERSION_NEWER(DUNE_COMMON,2,6)
     ImplicitProblem(TimeManager &timeManager, const GridView &gridView)
         : gridView_(gridView)
         , bBoxMin_(std::numeric_limits<double>::max())
         , bBoxMax_(-std::numeric_limits<double>::max())
+#if DUNE_VERSION_NEWER(DUNE_COMMON,2,6)
         , elementMapper_(gridView, Dune::mcmgElementLayout())
         , vertexMapper_(gridView, Dune::mcmgVertexLayout())
-        , timeManager_(&timeManager)
-        , newtonMethod_(asImp_())
-        , newtonCtl_(asImp_())
 #else
-    ImplicitProblem(TimeManager &timeManager, const GridView &gridView)
-        : gridView_(gridView)
-        , bBoxMin_(std::numeric_limits<double>::max())
-        , bBoxMax_(-std::numeric_limits<double>::max())
         , elementMapper_(gridView)
         , vertexMapper_(gridView)
+#endif
         , timeManager_(&timeManager)
         , newtonMethod_(asImp_())
         , newtonCtl_(asImp_())
-#endif
+
     {
         // calculate the bounding box of the local partition of the grid view
         for (const auto& vertex : vertices(gridView)) {
diff --git a/dumux/io/vtkmultiwriter.hh b/dumux/io/vtkmultiwriter.hh
index 307541166d6bececc08244223b4bec37bc8385c2..a0c81a958574c628facdd89839f1813f9cfe81a4 100644
--- a/dumux/io/vtkmultiwriter.hh
+++ b/dumux/io/vtkmultiwriter.hh
@@ -63,18 +63,14 @@ class VtkMultiWriter
 
 public:
     typedef Dune::VTKWriter<GridView> VtkWriter;
-#if DUNE_VERSION_NEWER(DUNE_COMMON,2,6)
     VtkMultiWriter(const GridView &gridView,
                    const std::string &simName = "",
                    std::string multiFileName = "")
         : gridView_(gridView)
+#if DUNE_VERSION_NEWER(DUNE_COMMON,2,6)
         , elementMapper_(gridView, Dune::mcmgElementLayout())
         , vertexMapper_(gridView, Dune::mcmgVertexLayout())
 #else
-    VtkMultiWriter(const GridView &gridView,
-                   const std::string &simName = "",
-                std::string multiFileName = "")
-        : gridView_(gridView)
         , elementMapper_(gridView)
         , vertexMapper_(gridView)
 #endif
diff --git a/dumux/material/spatialparams/gstatrandomfield.hh b/dumux/material/spatialparams/gstatrandomfield.hh
index 9d208ed2b1942b6b138f794b8970d0151414abde..fbe0924f757563a7d072c36504f13d395019d3eb 100644
--- a/dumux/material/spatialparams/gstatrandomfield.hh
+++ b/dumux/material/spatialparams/gstatrandomfield.hh
@@ -56,7 +56,11 @@ class GstatRandomField
 
     using DataVector = std::vector<Scalar>;
     using Element = typename GridView::Traits::template Codim<0>::Entity;
+#if DUNE_VERSION_NEWER(DUNE_COMMON,2,6)
+    using ElementMapper = Dune::MultipleCodimMultipleGeomTypeMapper<GridView>;
+#else
     using ElementMapper = Dune::MultipleCodimMultipleGeomTypeMapper<GridView, Dune::MCMGElementLayout>;
+#endif
 
 public:
     // Add field types if you want to implement e.g. tensor permeabilities.
@@ -67,15 +71,14 @@ public:
      *
      * \param gridView the used gridView
      */
-#if DUNE_VERSION_NEWER(DUNE_COMMON,2,6)
     GstatRandomField(const GridView& gridView)
-    : gridView_(gridView), elementMapper_(gridView, Dune::mcmgElementLayout()),
-      data_(gridView.size(0)) {}
+    : gridView_(gridView),
+#if DUNE_VERSION_NEWER(DUNE_COMMON,2,6)
+      elementMapper_(gridView, Dune::mcmgElementLayout()),
 #else
-    GstatRandomField(const GridView& gridView)
-    : gridView_(gridView), elementMapper_(gridView),
-      data_(gridView.size(0)) {}
+      elementMapper_(gridView),
 #endif
+      data_(gridView.size(0)) {}
 
       /*!
        * \brief Creates a new field with random variables, if desired.
diff --git a/dumux/porousmediumflow/sequential/variableclass.hh b/dumux/porousmediumflow/sequential/variableclass.hh
index 449064c8cfffa7b75731441dc79e6391259b3f6d..289b1659fd1acb7b6d0d40c80747cdcbb1d9828b 100644
--- a/dumux/porousmediumflow/sequential/variableclass.hh
+++ b/dumux/porousmediumflow/sequential/variableclass.hh
@@ -78,15 +78,16 @@ public:
     /**
      *  @param gridView a DUNE gridview object corresponding to diffusion and transport equation
      */
-#if DUNE_VERSION_NEWER(DUNE_COMMON,2,6)
     VariableClass(const GridView& gridView) :
-        gridView_(gridView), elementMapper_(gridView, Dune::mcmgElementLayout()), vertexMapper_(gridView, Dune::mcmgVertexLayout())
+        gridView_(gridView),
+#if DUNE_VERSION_NEWER(DUNE_COMMON,2,6)
+        elementMapper_(gridView, Dune::mcmgElementLayout()),
+        vertexMapper_(gridView, Dune::mcmgVertexLayout())
 #else
-    VariableClass(const GridView& gridView) :
-        gridView_(gridView), elementMapper_(gridView), vertexMapper_(gridView)
-    {}
+        elementMapper_(gridView),
+        vertexMapper_(gridView)
 #endif
-
+    {}
 
     //! Initializes the variable class
     /*! Method initializes the cellData vector.
diff --git a/test/geomechanics/el2p/el2pproblem.hh b/test/geomechanics/el2p/el2pproblem.hh
index 7b859abe35ed85f08a33c050a4e2b1b6fc33efae..f87399f2e411b405035e2678850471f5f6ffaa60 100644
--- a/test/geomechanics/el2p/el2pproblem.hh
+++ b/test/geomechanics/el2p/el2pproblem.hh
@@ -766,10 +766,13 @@ public:
      *
      * \param gridView The grid view
      */
+    InitialPressSat(const GridView & gridView)
+    : BaseT(gridView)
+    , gridView_(gridView)
 #if DUNE_VERSION_NEWER(DUNE_COMMON,2,6)
-    InitialPressSat(const GridView & gridView) : BaseT(gridView) , gridView_(gridView), vertexMapper_(gridView, Dune::mcmgVertexLayout())
+    , vertexMapper_(gridView, Dune::mcmgVertexLayout())
 #else
-    InitialPressSat(const GridView & gridView) : BaseT(gridView) , gridView_(gridView), vertexMapper_(gridView)
+    , vertexMapper_(gridView)
 #endif
     {
         // resize the pressure field vector with the number of vertices