diff --git a/dumux/decoupled/common/decoupledproperties.hh b/dumux/decoupled/common/decoupledproperties.hh
index 56c9cd879e054b4f0875332fc5b3b4bd20463359..349fdbe1cb7a3b591f4c34db688ead5a9c61715d 100644
--- a/dumux/decoupled/common/decoupledproperties.hh
+++ b/dumux/decoupled/common/decoupledproperties.hh
@@ -134,30 +134,16 @@ SET_PROP(DecoupledModel, SolutionTypes)
         maxIntersections = GET_PROP_VALUE(TypeTag, MaxIntersections)
     };
 
-    template<int dim>
-    struct VertexLayout
-    {
-        bool contains (Dune::GeometryType gt) const
-        {   return gt.dim() == 0;}
-    };
-
-    template<int dim>
-    struct ElementLayout
-    {
-        bool contains (Dune::GeometryType gt) const
-        {   return gt.dim() == dim;}
-    };
-
 public:
     /*!
      * \brief Mapper for the grid view's vertices.
      */
-    typedef Dune::MultipleCodimMultipleGeomTypeMapper<GridView, VertexLayout> VertexMapper;
+    typedef Dune::MultipleCodimMultipleGeomTypeMapper<GridView, Dune::MCMGVertexLayout> VertexMapper;
 
     /*!
      * \brief Mapper for the grid view's elements.
      */
-    typedef Dune::MultipleCodimMultipleGeomTypeMapper<GridView, ElementLayout> ElementMapper;
+    typedef Dune::MultipleCodimMultipleGeomTypeMapper<GridView, Dune::MCMGElementLayout> ElementMapper;
 
     /*!
      * \brief The type of a solution at a fixed time.
diff --git a/test/geomechanics/el2p/el2pproblem.hh b/test/geomechanics/el2p/el2pproblem.hh
index b4aa4f9c6078b235a30a170f243bb4e367ede90f..43e06630d68f45d9f927ef2f30728e71ec6a32af 100644
--- a/test/geomechanics/el2p/el2pproblem.hh
+++ b/test/geomechanics/el2p/el2pproblem.hh
@@ -814,16 +814,8 @@ public:
             saturationIdx = 1
     };
 
-    template<int dim>
-    struct VertexLayout
-    {
-        bool contains(Dune::GeometryType geomType) const
-        {
-           return geomType.dim() == 0;
-        }
-    };
     typedef typename Dune::MultipleCodimMultipleGeomTypeMapper<GridView,
-                        VertexLayout> VertexMapper;
+                        Dune::MCMGVertexLayout> VertexMapper;
 
     typedef typename GridView::template Codim<GridView::dimension>::Iterator
                         VertexIterator;
diff --git a/test/multidomain/2cnistokes2p2cni/2cnistokes2p2cniproblem.hh b/test/multidomain/2cnistokes2p2cni/2cnistokes2p2cniproblem.hh
index 89f5fe550fdf587b7416d3f6f3d00ca123abc3fa..33a126d79b311088167d6e091b8d0f607371fb1a 100644
--- a/test/multidomain/2cnistokes2p2cni/2cnistokes2p2cniproblem.hh
+++ b/test/multidomain/2cnistokes2p2cni/2cnistokes2p2cniproblem.hh
@@ -123,13 +123,6 @@ SET_TYPE_PROP(TwoCNIStokesTwoPTwoCNIProblem, LinearSolver, SuperLUBackend<TypeTa
 template <class TypeTag = TTAG(TwoCNIStokesTwoPTwoCNIProblem) >
 class TwoCNIStokesTwoPTwoCNIProblem : public MultiDomainProblem<TypeTag>
 {
-    template<int dim>
-    struct VertexLayout
-    {
-        bool contains(Dune::GeometryType geomtype)
-        { return geomtype.dim() == 0; }
-    };
-
     typedef TwoCNIStokesTwoPTwoCNIProblem<TypeTag> ThisType;
     typedef MultiDomainProblem<TypeTag> ParentType;
 
diff --git a/test/multidomain/2cstokes2p2c/2cstokes2p2cproblem.hh b/test/multidomain/2cstokes2p2c/2cstokes2p2cproblem.hh
index 4f139305da5eef7b4dd5382991874f7aed2d5e2c..8730ad1ba1dd0f486cddc75959b221b33cc05c5b 100644
--- a/test/multidomain/2cstokes2p2c/2cstokes2p2cproblem.hh
+++ b/test/multidomain/2cstokes2p2c/2cstokes2p2cproblem.hh
@@ -123,13 +123,6 @@ SET_TYPE_PROP(TwoCStokesTwoPTwoCProblem, LinearSolver, SuperLUBackend<TypeTag>);
 template <class TypeTag = TTAG(TwoCStokesTwoPTwoCProblem) >
 class TwoCStokesTwoPTwoCProblem : public MultiDomainProblem<TypeTag>
 {
-    template<int dim>
-    struct VertexLayout
-    {
-        bool contains(Dune::GeometryType geomtype)
-        { return geomtype.dim() == 0; }
-    };
-
     typedef TwoCStokesTwoPTwoCProblem<TypeTag> ThisType;
     typedef MultiDomainProblem<TypeTag> ParentType;