diff --git a/dumux/freeflow/navierstokes/momentum/problem.hh b/dumux/freeflow/navierstokes/momentum/problem.hh
index 914b31eaec81c061bb3611099e24386a959c8b0e..537a9161906b18ba08bbcc032bb54b0384fa87d4 100644
--- a/dumux/freeflow/navierstokes/momentum/problem.hh
+++ b/dumux/freeflow/navierstokes/momentum/problem.hh
@@ -531,7 +531,7 @@ private:
 };
 
 /*!
- * \brief Navier-Stokes default problem implementation for FCDiamond discretizations
+ * \brief Navier-Stokes default problem implementation for CVFE discretizations
  */
 template<class TypeTag, class DM>
 class NavierStokesMomentumProblemImpl<TypeTag, DiscretizationMethods::CVFE<DM>>
@@ -563,10 +563,6 @@ class NavierStokesMomentumProblemImpl<TypeTag, DiscretizationMethods::CVFE<DM>>
     using CouplingManager = GetPropType<TypeTag, Properties::CouplingManager>;
     using ModelTraits = GetPropType<TypeTag, Properties::ModelTraits>;
 
-    static constexpr bool isCVFE = DiscretizationMethods::isCVFE<
-        typename GridGeometry::DiscretizationMethod
-    >;
-
 public:
     //! These types are used in place of the typical NumEqVector type.
     //! In the numeqvector assembly type, only one equation per DOF (face) is considered
@@ -668,10 +664,6 @@ public:
     BoundaryTypes boundaryTypes(const Element& element,
                                 const SubControlVolume& scv) const
     {
-        if (!isCVFE)
-            DUNE_THROW(Dune::InvalidStateException,
-                       "boundaryTypes(..., scv) called for for a non CVFE method.");
-
         // forward it to the method which only takes the global coordinate
         return asImp_().boundaryTypesAtPos(scv.dofPosition());
     }
@@ -686,12 +678,7 @@ public:
     BoundaryTypes boundaryTypes(const Element& element,
                                 const SubControlVolumeFace& scvf) const
     {
-        if (isCVFE)
-            DUNE_THROW(Dune::InvalidStateException,
-                       "boundaryTypes(..., scvf) called for a CVFE method.");
-
-        // forward it to the method which only takes the global coordinate
-        return asImp_().boundaryTypesAtPos(scvf.ipGlobal());
+        DUNE_THROW(Dune::InvalidStateException, "boundaryTypes(..., scvf) called for a CVFE method.");
     }
 
     /*!
@@ -704,10 +691,7 @@ public:
     DirichletValues dirichlet(const Element& element, const SubControlVolume& scv) const
     {
         // forward it to the method which only takes the global coordinate
-        if (!isCVFE)
-            DUNE_THROW(Dune::InvalidStateException, "dirichlet(scv) called for a non CVFE method.");
-        else
-            return asImp_().dirichletAtPos(scv.dofPosition());
+        return asImp_().dirichletAtPos(scv.dofPosition());
     }
 
     /*!
@@ -720,10 +704,7 @@ public:
     DirichletValues dirichlet(const Element& element, const SubControlVolumeFace& scvf) const
     {
         // forward it to the method which only takes the global coordinate
-        if (isCVFE)
-            DUNE_THROW(Dune::InvalidStateException, "dirichlet(scvf) called for CVFE method.");
-        else
-            return asImp_().dirichletAtPos(scvf.ipGlobal());
+        DUNE_THROW(Dune::InvalidStateException, "dirichlet(scvf) called for CVFE method.");
     }
 
     /*!