diff --git a/dumux/assembly/fvassembler.hh b/dumux/assembly/fvassembler.hh
index 084478e5950d5d4b99bafc67e2022c6cb88c90be..4200502c630356b52fbed21e7ce2d597ff7e9748 100644
--- a/dumux/assembly/fvassembler.hh
+++ b/dumux/assembly/fvassembler.hh
@@ -67,7 +67,6 @@ public:
     using Scalar = GetPropType<TypeTag, Properties::Scalar>;
     using JacobianMatrix = GetPropType<TypeTag, Properties::JacobianMatrix>;
     using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
-    using FVGridGeometry [[deprecated("Use GridGeometry instead. FVGridGeometry will be removed after 3.1!")]] = GridGeometry;
     using Problem = GetPropType<TypeTag, Properties::Problem>;
     using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
 
@@ -270,11 +269,6 @@ public:
     const Problem& problem() const
     { return *problem_; }
 
-    //! The global finite volume geometry
-    [[deprecated("Use gridGeometry() instead. fvGridGeometry() will be removed after 3.1!")]]
-    const GridGeometry& fvGridGeometry() const
-    { return gridGeometry(); }
-
     //! The global finite volume geometry
     const GridGeometry& gridGeometry() const
     { return *gridGeometry_; }
diff --git a/dumux/common/fvproblem.hh b/dumux/common/fvproblem.hh
index a2c8902238e9cd47ee26a99dce7195cd58565586..47e6f4313e90b308672d9147b2dce9bf18751da5 100644
--- a/dumux/common/fvproblem.hh
+++ b/dumux/common/fvproblem.hh
@@ -578,11 +578,6 @@ public:
 
     // \}
 
-    //! The finite volume grid geometry
-    [[deprecated("Use gridGeometry() instead. fvGridGeometry() will be removed after 3.1!")]]
-    const GridGeometry& fvGridGeometry() const
-    { return gridGeometry(); }
-
     //! The finite volume grid geometry
     const GridGeometry& gridGeometry() const
     { return *gridGeometry_; }
diff --git a/dumux/common/properties.hh b/dumux/common/properties.hh
index 6f839cefe3e82e15eea3b3b4a935ba3fe2f06a02..c957238580bb342309e7f27450aa24bea642048a 100644
--- a/dumux/common/properties.hh
+++ b/dumux/common/properties.hh
@@ -112,64 +112,10 @@ struct BalanceEqOpts { using type = UndefinedProperty; };          //!< A class
 template<class TypeTag, class MyTypeTag>
 struct ElementBoundaryTypes { using type = UndefinedProperty; };                //!< Stores the boundary types on an element
 
-#if defined(__clang__) && !defined(DONT_EMIT_CLANG_GRIDGEOMETRY_WARNING)
-#warning "The properties `FVGridGeometry` and `EnableFVGridGeometryCache` \
-are deprecated in favor of `GridGeometry` and `EnableGridGeometryCache`. \
-The old properties will be removed after release 3.1. \
-If clang is used, no deprecation warnings are emitted. \
-We recommend to use gcc for getting rid of the warnings. \
-You can suppress this message by defining the preprocessor variable \
-DONT_EMIT_CLANG_GRIDGEOMETRY_WARNING."
-#endif
-// TODO: Remove deprecated property FVGridGeometry after 3.1
-template<class TypeTag, class MyTypeTag>
-struct [[deprecated("Use GridGeometry instead.")]] FVGridGeometry { using type = UndefinedProperty; }; //!< The type of the global finite volume geometry
-
-// TODO: Remove deprecated property EnableFVGridGeometryCache after 3.1
-template<class TypeTag, class MyTypeTag>
-struct [[deprecated("Use EnableGridGeometryCache instead.")]] EnableFVGridGeometryCache { using type = UndefinedProperty; };           //!< specifies if geometric data is saved (faster, but more memory consuming)
-
-// Dumux 3.1 changes the property `FVGridGeometry` to `GridGeometry`.
-// For ensuring backward compatibility, it is necessary to set the default value
-// of the new property to the old one, see the discussion in MR 1647.
-// Use diagnostic pragmas to prevent the emission of a warning message.
-// TODO after 3.1: change default vale to `UndefinedProperty`, remove pragmas
-// and comment.
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-
-template<class TypeTag, class T>
-struct GridGeometryHelper
-{ using type = GetPropType<TypeTag, Properties::FVGridGeometry>; };
-
-template<class TypeTag>
-struct GridGeometryHelper<TypeTag, UndefinedProperty>
-{ using type = UndefinedProperty; };
-
 template<class TypeTag, class MyTypeTag>
-struct GridGeometry
-{
-    using type = typename GridGeometryHelper<TypeTag, typename FVGridGeometry<TypeTag, MyTypeTag>::type>::type;
-};
-
-template<class TypeTag, bool hasParentTypeTag>
-struct EnableGridGeometryCacheHelper
-{ using type = UndefinedProperty; };
-
-template<class TypeTag>
-struct EnableGridGeometryCacheHelper<TypeTag, false>
-{
-    // fallback
-    static constexpr bool value = getPropValue<TypeTag, Properties::EnableFVGridGeometryCache>();
-};
-
-// only use the fallback (EnableFVGridGeometryCache) if none
-// of the TypeTags define EnableGridGeometryCache
+struct GridGeometry { using type = UndefinedProperty; };
 template <class TypeTag, class MyTypeTag>
-struct EnableGridGeometryCache : public EnableGridGeometryCacheHelper<TypeTag, Detail::hasParentTypeTag<MyTypeTag>(int{})>
-{};
-
-#pragma GCC diagnostic pop
+struct EnableGridGeometryCache { using type = UndefinedProperty; };
 
 template<class TypeTag, class MyTypeTag>
 struct VolumeVariables { using type = UndefinedProperty; };                     //!< The secondary variables within a sub-control volume
diff --git a/dumux/discretization/box.hh b/dumux/discretization/box.hh
index bb3787685cef4e54b53d28fb1a68180978722200..23eec15153ec6c74f4dcbe44bde685a9391ef80e 100644
--- a/dumux/discretization/box.hh
+++ b/dumux/discretization/box.hh
@@ -51,16 +51,9 @@ namespace TTag {
 struct BoxModel { using InheritsFrom = std::tuple<FiniteVolumeModel>; };
 } // end namespace TTag
 
-// Dumux 3.1 changes the property `FVGridGeometry` to `GridGeometry`.
-// For ensuring backward compatibility on the user side, it is necessary to
-// stick to the old name for the specializations, see the discussion in MR 1647.
-// Use diagnostic pragmas to prevent the emission of a warning message.
-// TODO after 3.1: Rename to GridGeometry, remove the pragmas and this comment.
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-//! Set the default for the global finite volume geometry
+//! Set the default for the grid geometry
 template<class TypeTag>
-struct FVGridGeometry<TypeTag, TTag::BoxModel>
+struct GridGeometry<TypeTag, TTag::BoxModel>
 {
 private:
     static constexpr bool enableCache = getPropValue<TypeTag, Properties::EnableGridGeometryCache>();
@@ -69,7 +62,6 @@ private:
 public:
     using type = BoxFVGridGeometry<Scalar, GridView, enableCache>;
 };
-#pragma GCC diagnostic pop
 
 //! The grid volume variables vector class
 template<class TypeTag>
diff --git a/dumux/discretization/box/fvelementgeometry.hh b/dumux/discretization/box/fvelementgeometry.hh
index ebae96a338298894375a73a193b8a39eb53a9b57..cb4db856063dfac0ce4da0cad42b57783d1cd541 100644
--- a/dumux/discretization/box/fvelementgeometry.hh
+++ b/dumux/discretization/box/fvelementgeometry.hh
@@ -67,7 +67,6 @@ public:
     using SubControlVolumeFace = typename GG::SubControlVolumeFace;
     //! export type of finite volume grid geometry
     using GridGeometry = GG;
-    using FVGridGeometry [[deprecated ("Use GridGeometry instead. Will be removed after 3.1!")]]= GridGeometry;
     //! the maximum number of scvs per element (2^dim for cubes)
     static constexpr std::size_t maxNumElementScvs = (1<<dim);
 
@@ -148,10 +147,7 @@ public:
         eIdx_ = gridGeometry().elementMapper().index(element);
     }
 
-    //! The global finite volume geometry we are a restriction of
-    [[deprecated ("Use gridGeometry() instead. fvGridGeometry() will be removed after 3.1!")]]
-    const GridGeometry& fvGridGeometry() const
-    { return gridGeometry(); }
+    //! The grid geometry we are a restriction of
     const GridGeometry& gridGeometry() const
     { return *gridGeometryPtr_; }
 
@@ -190,7 +186,6 @@ public:
     using SubControlVolumeFace = typename GG::SubControlVolumeFace;
     //! export type of finite volume grid geometry
     using GridGeometry = GG;
-    using FVGridGeometry [[deprecated ("Use GridGeometry instead. Will be removed after 3.1!")]]= GridGeometry;
     //! the maximum number of scvs per element (2^dim for cubes)
     static constexpr std::size_t maxNumElementScvs = (1<<dim);
 
@@ -269,10 +264,7 @@ public:
         makeElementGeometries(element);
     }
 
-    //! The global finite volume geometry we are a restriction of
-    [[deprecated ("Use gridGeometry() instead. fvGridGeometry() will be removed after 3.1!")]]
-    const GridGeometry& fvGridGeometry() const
-    { return gridGeometry(); }
+    //! The grid geometry we are a restriction of
     const GridGeometry& gridGeometry() const
     { return *gridGeometryPtr_; }
 
diff --git a/dumux/discretization/ccmpfa.hh b/dumux/discretization/ccmpfa.hh
index 73b175cbaebc3b8e6c49093115d30105d7a6482a..30a38a7400e7fe0e7371a809e405df0f22a1fa5a 100644
--- a/dumux/discretization/ccmpfa.hh
+++ b/dumux/discretization/ccmpfa.hh
@@ -96,16 +96,9 @@ public:
     using type = CCMpfaOInteractionVolume< Traits >;
 };
 
-// Dumux 3.1 changes the property `FVGridGeometry` to `GridGeometry`.
-// For ensuring backward compatibility on the user side, it is necessary to
-// stick to the old name for the specializations, see the discussion in MR 1647.
-// Use diagnostic pragmas to prevent the emission of a warning message.
-// TODO after 3.1: Rename to GridGeometry, remove the pragmas and this comment.
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-//! Set the default for the global finite volume geometry
+//! Set the default for the grid geometry
 template<class TypeTag>
-struct FVGridGeometry<TypeTag, TTag::CCMpfaModel>
+struct GridGeometry<TypeTag, TTag::CCMpfaModel>
 {
 private:
     using GridView = GetPropType<TypeTag, Properties::GridView>;
@@ -116,7 +109,6 @@ private:
 public:
     using type = CCMpfaFVGridGeometry<GridView, Traits, getPropValue<TypeTag, Properties::EnableGridGeometryCache>()>;
 };
-#pragma GCC diagnostic pop
 
 //! The grid volume variables vector class
 template<class TypeTag>
diff --git a/dumux/discretization/cctpfa.hh b/dumux/discretization/cctpfa.hh
index c43fb7186d58513ea1b13c7455d4de5b9e196e53..7bb6b14c050eb60f52d6575c9323671a9e01894a 100644
--- a/dumux/discretization/cctpfa.hh
+++ b/dumux/discretization/cctpfa.hh
@@ -50,16 +50,9 @@ namespace TTag {
 struct CCTpfaModel { using InheritsFrom = std::tuple<FiniteVolumeModel>; };
 } // end namespace TTag
 
-// Dumux 3.1 changes the property `FVGridGeometry` to `GridGeometry`.
-// For ensuring backward compatibility on the user side, it is necessary to
-// stick to the old name for the specializations, see the discussion in MR 1647.
-// Use diagnostic pragmas to prevent the emission of a warning message.
-// TODO after 3.1: Rename to GridGeometry, remove the pragmas and this comment.
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-//! Set the default for the global finite volume geometry
+//! Set the default for the grid geometry
 template<class TypeTag>
-struct FVGridGeometry<TypeTag, TTag::CCTpfaModel>
+struct GridGeometry<TypeTag, TTag::CCTpfaModel>
 {
 private:
     static constexpr bool enableCache = getPropValue<TypeTag, Properties::EnableGridGeometryCache>();
@@ -67,7 +60,6 @@ private:
 public:
     using type = CCTpfaFVGridGeometry<GridView, enableCache>;
 };
-#pragma GCC diagnostic pop
 
 //! The grid volume variables vector class
 template<class TypeTag>
diff --git a/dumux/discretization/cellcentered/mpfa/fvelementgeometry.hh b/dumux/discretization/cellcentered/mpfa/fvelementgeometry.hh
index 218bfecbad71192945505eda2bd8afef7ed227e7..b4e0d84987a0b906b30e24823d658c61c13dfb46 100644
--- a/dumux/discretization/cellcentered/mpfa/fvelementgeometry.hh
+++ b/dumux/discretization/cellcentered/mpfa/fvelementgeometry.hh
@@ -71,7 +71,6 @@ public:
     using SubControlVolumeFace = typename GG::SubControlVolumeFace;
     //! export type of finite volume grid geometry
     using GridGeometry = GG;
-    using FVGridGeometry [[deprecated("Use GridGeometry instead. Will be removed after 3.1!" )]] = GridGeometry;
     //! the maximum number of scvs per element
     static constexpr std::size_t maxNumElementScvs = 1;
     //! the maximum number of scvfs per element (use cubes for maximum)
@@ -153,11 +152,9 @@ public:
     }
 
     //! The global finite volume geometry we are a restriction of
-    [[deprecated("Use gridGeometry() instead. fvGridGeometry() will be removed after 3.1!")]]
-    const GridGeometry& fvGridGeometry() const
-    { return gridGeometry(); }
     const GridGeometry& gridGeometry() const
     { return *gridGeometryPtr_; }
+
     //! Returns whether one of the geometry's scvfs lies on a boundary
     bool hasBoundaryScvf() const
     { return gridGeometry().hasBoundaryScvf(scvIndices_[0]); }
@@ -194,7 +191,6 @@ public:
     using SubControlVolumeFace = typename GG::SubControlVolumeFace;
     //! export type of finite volume grid geometrys
     using GridGeometry = GG;
-    using FVGridGeometry [[deprecated("Use GridGeometry instead. Will be removed after 3.1!")]] = GridGeometry;
     //! the maximum number of scvs per element
     static constexpr std::size_t maxNumElementScvs = 1;
     //! the maximum number of scvfs per element (use cubes for maximum)
@@ -315,11 +311,9 @@ public:
     }
 
     //! The global finite volume geometry we are a restriction of
-    [[deprecated("Use gridGeometry() instead. fvGridGeometry() will be removed after 3.1!")]]
-    const GridGeometry& fvGridGeometry() const
-    { return gridGeometry(); }
     const GridGeometry& gridGeometry() const
     { return *gridGeometryPtr_; }
+
     //! Returns whether one of the geometry's scvfs lies on a boundary
     bool hasBoundaryScvf() const
     { return hasBoundaryScvf_; }
diff --git a/dumux/discretization/cellcentered/tpfa/fvelementgeometry.hh b/dumux/discretization/cellcentered/tpfa/fvelementgeometry.hh
index 9641a72faa938155ffab2d2d2c0322ae4dc1f50e..8a9335603f5e44d3274575cf059d1cd1986686c6 100644
--- a/dumux/discretization/cellcentered/tpfa/fvelementgeometry.hh
+++ b/dumux/discretization/cellcentered/tpfa/fvelementgeometry.hh
@@ -70,7 +70,6 @@ public:
     using SubControlVolumeFace = typename GG::SubControlVolumeFace;
     //! export type of finite volume grid geometry
     using GridGeometry = GG;
-    using FVGridGeometry [[deprecated("Use GridGeometry instead. Will be removed after 3.1!")]]  = GridGeometry;
 
     //! the maximum number of scvs per element
     static constexpr std::size_t maxNumElementScvs = 1;
@@ -158,9 +157,6 @@ public:
     //! The global finite volume geometry we are a restriction of
     const GridGeometry& gridGeometry() const
     { return *gridGeometryPtr_; }
-    [[deprecated("Use gridGeometry() instead. fvGridGeometry() will be removed after 3.1!")]]
-    const GridGeometry& fvGridGeometry() const
-    { return gridGeometry(); }
 
     //! Returns whether one of the geometry's scvfs lies on a boundary
     bool hasBoundaryScvf() const
@@ -197,7 +193,6 @@ public:
     using SubControlVolumeFace = typename GG::SubControlVolumeFace;
     //! export type of finite volume grid geometry
     using GridGeometry = GG;
-    using FVGridGeometry [[deprecated("Use GridGeometry instead. Will be removed after 3.1!")]]  = GridGeometry;
     //! the maximum number of scvs per element
     static constexpr std::size_t maxNumElementScvs = 1;
     //! the maximum number of scvfs per element (use cubes for maximum)
@@ -362,9 +357,6 @@ public:
     //! The global finite volume geometry we are a restriction of
     const GridGeometry& gridGeometry() const
     { return *gridGeometryPtr_; }
-    [[deprecated("Use gridGeometry() instead. fvGridGeometry() will be removed after 3.1!")]]
-    const GridGeometry& fvGridGeometry() const
-    { return gridGeometry(); }
 
     //! Returns whether one of the geometry's scvfs lies on a boundary
     bool hasBoundaryScvf() const
diff --git a/dumux/discretization/fvgridvariables.hh b/dumux/discretization/fvgridvariables.hh
index 3df3811fd115f33f8f00918b0e59189a9dea0207..a5f05550cd05215e403652de32bfe1d2b3522468 100644
--- a/dumux/discretization/fvgridvariables.hh
+++ b/dumux/discretization/fvgridvariables.hh
@@ -161,11 +161,6 @@ public:
     GridVolumeVariables& prevGridVolVars()
     { return prevGridVolVars_; }
 
-    //! return the finite volume grid geometry
-    [[deprecated("Use gridGeometry() instead. fvGridGeometry() will be removed after 3.1!")]]
-    const GridGeometry& fvGridGeometry() const
-    { return gridGeometry(); }
-
     //! return the finite volume grid geometry
     const GridGeometry& gridGeometry() const
     { return *gridGeometry_; }
diff --git a/dumux/discretization/fvproperties.hh b/dumux/discretization/fvproperties.hh
index 79f157bb54be1443d85cba00ec9406fe81142bfb..c84ac2cb35cd94a3d54ad7e867583f3eb4a6a59a 100644
--- a/dumux/discretization/fvproperties.hh
+++ b/dumux/discretization/fvproperties.hh
@@ -55,17 +55,9 @@ public:
     using type = FVGridVariables<GG, GVV, GFVC>;
 };
 
-// Dumux 3.1 changes the property `EnableFVGridGeometryCache` to `EnableGridGeometryCache`.
-// For ensuring backward compatibility on the user side, it is necessary to
-// stick to the old name for the specializations, see the discussion in MR 1647.
-// Use diagnostic pragmas to prevent the emission of a warning message.
-// TODO after 3.1: Rename to EnableGridGeometryCache, remove the pragmas and this comment.
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 //! We do not store the FVGeometry by default
 template<class TypeTag>
-struct EnableFVGridGeometryCache<TypeTag, TTag::FiniteVolumeModel> { static constexpr bool value = false; };
-#pragma GCC diagnostic pop
+struct EnableGridGeometryCache<TypeTag, TTag::FiniteVolumeModel> { static constexpr bool value = false; };
 
 //! We do not store the volume variables by default
 template<class TypeTag>
diff --git a/dumux/discretization/staggered/freeflow/properties.hh b/dumux/discretization/staggered/freeflow/properties.hh
index 1c9f1b12ff4f232b6fb4a074f6d26f49f28938e5..a98ba07308db24b9aa56b2578022e743057e2b78 100644
--- a/dumux/discretization/staggered/freeflow/properties.hh
+++ b/dumux/discretization/staggered/freeflow/properties.hh
@@ -76,16 +76,9 @@ public:
     static constexpr int value = numEq - dim;
 };
 
-// Dumux 3.1 changes the property `FVGridGeometry` to `GridGeometry`.
-// For ensuring backward compatibility on the user side, it is necessary to
-// stick to the old name for the specializations, see the discussion in MR 1647.
-// Use diagnostic pragmas to prevent the emission of a warning message.
-// TODO after 3.1: Rename to GridGeometry, remove the pragmas and this comment.
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-//! The default fv grid geometry
+//! The default grid geometry
 template<class TypeTag>
-struct FVGridGeometry<TypeTag, TTag::StaggeredFreeFlowModel>
+struct GridGeometry<TypeTag, TTag::StaggeredFreeFlowModel>
 {
 private:
     static constexpr auto upwindSchemeOrder = getPropValue<TypeTag, Properties::UpwindSchemeOrder>();
@@ -95,7 +88,6 @@ private:
 public:
     using type = StaggeredFVGridGeometry<GridView, enableCache, Traits>;
 };
-#pragma GCC diagnostic pop
 
 //! The variables living on the faces
 template<class TypeTag>
diff --git a/dumux/discretization/staggered/fvelementgeometry.hh b/dumux/discretization/staggered/fvelementgeometry.hh
index 7423d43da48297968255c05ff599d03d7ddcd98f..ed0156e618f67a5aa0a5c4aa64a969bb1eea3bc1 100644
--- a/dumux/discretization/staggered/fvelementgeometry.hh
+++ b/dumux/discretization/staggered/fvelementgeometry.hh
@@ -99,7 +99,6 @@ public:
     using SubControlVolumeFace = typename GG::SubControlVolumeFace;
     //! export type of finite volume grid geometry
     using GridGeometry = GG;
-    using FVGridGeometry [[deprecated ("Use GridGeometry instead. Will be removed after 3.1!")]] = GridGeometry;
 
     //! Constructor getting a auxiliary cell center of face specific FvGridGeometry type.
     //! Needed for the multi-domain framework.
@@ -209,10 +208,7 @@ public:
         makeElementGeometries_(element);
     }
 
-    //! The global finite volume geometry we are a restriction of
-    [[deprecated("Use gridGeometry() instead. fvGridGeometry() will be removed after 3.1!")]]
-    const GridGeometry& fvGridGeometry() const
-    { return gridGeometry(); }
+    //! The grid finite volume geometry we are a restriction of
     const GridGeometry& gridGeometry() const
     { return *gridGeometryPtr_; }
 
diff --git a/dumux/material/spatialparams/fv1p.hh b/dumux/material/spatialparams/fv1p.hh
index fecc19e4e1008fc3271fec19b81f0e7c92ad4311..d638f82598642d7d15af2e7b39f8540dc5f79d79 100644
--- a/dumux/material/spatialparams/fv1p.hh
+++ b/dumux/material/spatialparams/fv1p.hh
@@ -325,11 +325,6 @@ public:
         return forchCoeffDefault_;
     }
 
-    //! The finite volume grid geometry
-    [[deprecated("Use gridGeometry() instead. fvGridGeometry() will be removed after 3.1!")]]
-    const GridGeometry& fvGridGeometry() const
-    { return *gridGeometry_; }
-
     //! The finite volume grid geometry
     const GridGeometry& gridGeometry() const
     { return *gridGeometry_; }
diff --git a/dumux/material/spatialparams/fvelastic.hh b/dumux/material/spatialparams/fvelastic.hh
index 84f67a33638a51ec5762154ec8bb9bb92128edce..ed89b81e165aabdeb7eeabe00d79d05a7043d78f 100644
--- a/dumux/material/spatialparams/fvelastic.hh
+++ b/dumux/material/spatialparams/fvelastic.hh
@@ -158,11 +158,6 @@ public:
         return asImp_().lameParamsAtPos(fluxVarsCache.ipGlobal());
     }
 
-    //! The finite volume grid geometry
-    [[deprecated("Use gridGeometry() instead. fvGridGeometry() will be removed after 3.1!")]]
-    const GridGeometry& fvGridGeometry() const
-    { return *gridGeometry_; }
-
     //! The finite volume grid geometry
     const GridGeometry& gridGeometry() const
     { return *gridGeometry_; }
diff --git a/dumux/material/spatialparams/fvporoelastic.hh b/dumux/material/spatialparams/fvporoelastic.hh
index 602893c0c27b0396774645ea3206c8991ed3ea69..22e7532cef78eb7c02174cc7ac7dba6bbd72806b 100644
--- a/dumux/material/spatialparams/fvporoelastic.hh
+++ b/dumux/material/spatialparams/fvporoelastic.hh
@@ -313,15 +313,10 @@ public:
         return asImp_().biotCoefficientAtPos(fluxVarsCache.ipGlobal());
     }
 
-    //! The finite volume grid geometry
-    [[deprecated("Use gridGeometry() instead. fvGridGeometry() will be removed after 3.1!")]]
-    const GridGeometry& fvGridGeometry() const
-    { return *gridGeometry_; }
-
     //! The finite volume grid geometry
     const GridGeometry& gridGeometry() const
     { return *gridGeometry_; }
-    
+
 protected:
     Implementation &asImp_()
     { return *static_cast<Implementation*>(this); }
diff --git a/dumux/multidomain/facet/box/fvelementgeometry.hh b/dumux/multidomain/facet/box/fvelementgeometry.hh
index c7824b3f2ea7f9b4575314aee0bb4888b7294e08..6fd4666bf8c556faa598628a8e7bdd9e2d334b0c 100644
--- a/dumux/multidomain/facet/box/fvelementgeometry.hh
+++ b/dumux/multidomain/facet/box/fvelementgeometry.hh
@@ -67,8 +67,6 @@ public:
     using SubControlVolumeFace = typename GG::SubControlVolumeFace;
     //! export type of finite volume grid geometry
     using GridGeometry = GG;
-    //! export type of finite volume grid geometry
-    using FVGridGeometry [[deprecated("Use more general GridGeometry instead. FVGridGeometry will be removed after 3.1!")]] = GridGeometry;
     //! the maximum number of scvs per element (2^dim for cubes)
     static constexpr std::size_t maxNumElementScvs = (1<<dim);
 
@@ -140,11 +138,6 @@ public:
         eIdx_ = gridGeometry().elementMapper().index(element);
     }
 
-    //! The global finite volume geometry we are a restriction of
-    [[deprecated("Use gridGeometry() instead. fvGridGeometry() will be removed after 3.1!")]]
-    const GridGeometry& fvGridGeometry() const
-    { return *gridGeometryPtr_; }
-
     //! The global finite volume geometry we are a restriction of
     const GridGeometry& gridGeometry() const
     { return *gridGeometryPtr_; }
@@ -182,8 +175,6 @@ public:
     using SubControlVolumeFace = typename GG::SubControlVolumeFace;
     //! export type of finite volume grid geometry
     using GridGeometry = GG;
-    //! export type of finite volume grid geometry
-    using FVGridGeometry [[deprecated("Use more general GridGeometry instead. FVGridGeometry will be removed after 3.1!")]] = GridGeometry;
     //! the maximum number of scvs per element (2^dim for cubes)
     static constexpr std::size_t maxNumElementScvs = (1<<dim);
 
@@ -253,11 +244,6 @@ public:
         makeElementGeometries(element);
     }
 
-    //! The global finite volume geometry we are a restriction of
-    [[deprecated("Use gridGeometry() instead. fvGridGeometry() will be removed after 3.1!")]]
-    const GridGeometry& fvGridGeometry() const
-    { return *gridGeometryPtr_; }
-
     //! The global finite volume geometry we are a restriction of
     const GridGeometry& gridGeometry() const
     { return *gridGeometryPtr_; }
diff --git a/dumux/multidomain/facet/box/properties.hh b/dumux/multidomain/facet/box/properties.hh
index 25b92ec27704c46d3c20bccb598aa40eebefbf99..cb50c6e1348304b54425f642909111cd66edaa2f 100644
--- a/dumux/multidomain/facet/box/properties.hh
+++ b/dumux/multidomain/facet/box/properties.hh
@@ -76,16 +76,9 @@ template<class TypeTag>
 struct ElementBoundaryTypes<TypeTag, TTag::BoxFacetCouplingModel>
 { using type = BoxFacetCouplingElementBoundaryTypes<GetPropType<TypeTag, Properties::BoundaryTypes>>; };
 
-// Dumux 3.1 changes the property `FVGridGeometry` to `GridGeometry`.
-// For ensuring backward compatibility on the user side, it is necessary to
-// stick to the old name for the specializations, see the discussion in MR 1647.
-// Use diagnostic pragmas to prevent the emission of a warning message.
-// TODO after 3.1: Rename to GridGeometry, remove the pragmas and this comment.
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 //! Set the default for the grid finite volume geometry
 template<class TypeTag>
-struct FVGridGeometry<TypeTag, TTag::BoxFacetCouplingModel>
+struct GridGeometry<TypeTag, TTag::BoxFacetCouplingModel>
 {
 private:
     static constexpr bool enableCache = getPropValue<TypeTag, Properties::EnableGridGeometryCache>();
@@ -94,7 +87,6 @@ private:
 public:
     using type = BoxFacetCouplingFVGridGeometry<Scalar, GridView, enableCache>;
 };
-#pragma GCC diagnostic pop
 
 } // namespace Properties
 } // namespace Dumux
diff --git a/dumux/multidomain/staggeredtraits.hh b/dumux/multidomain/staggeredtraits.hh
index 0d9edcc8554214f6f603debea8c118833a90fb2e..6305b90e17c8296f8f6c625817f77b4694b5f173 100644
--- a/dumux/multidomain/staggeredtraits.hh
+++ b/dumux/multidomain/staggeredtraits.hh
@@ -195,7 +195,6 @@ public:
         using TypeTag = SubDomainTypeTag<id>;
         using Problem = GetPropType<SubDomainTypeTag<id>, Properties::Problem>;
         using GridGeometry = typename Detail::Staggered::SubDomainFVGridGeometryImpl<SubDomainTypeTag, id>::type;
-        using FVGridGeometry [[deprecated("Use GridGeometry instead. FVGridGeometry will be removed after 3.1!")]] = GridGeometry;
         using GridVariables = typename Detail::Staggered::SubDomainGridVariablesImpl<SubDomainTypeTag, id>::type;
         using SolutionVector = typename Detail::Staggered::SubDomainSolutionVectorImpl<SubDomainTypeTag, id>::type;
         using PrimaryVariables = typename Detail::Staggered::SubDomainPrimaryVariablesImpl<SubDomainTypeTag, id>::type;
diff --git a/dumux/multidomain/traits.hh b/dumux/multidomain/traits.hh
index e3ac5069a846df02ebbf6200f8e2155d6706c690..0d19021bc4deb082746ed574d74bf3fb95e37b32 100644
--- a/dumux/multidomain/traits.hh
+++ b/dumux/multidomain/traits.hh
@@ -182,7 +182,6 @@ public:
         using TypeTag = SubDomainTypeTag<id>;
         using Grid = GetPropType<SubDomainTypeTag<id>, Properties::Grid>;
         using GridGeometry = GetPropType<SubDomainTypeTag<id>, Properties::GridGeometry>;
-        using FVGridGeometry [[deprecated("Use GridGeometry instead. FVGridGeometry will be removed after 3.1!")]] = GridGeometry;
         using Problem = GetPropType<SubDomainTypeTag<id>, Properties::Problem>;
         using GridVariables =GetPropType<SubDomainTypeTag<id>, Properties::GridVariables>;
         using IOFields = GetPropType<SubDomainTypeTag<id>, Properties::IOFields>;
diff --git a/dumux/porousmediumflow/boxdfm/fvelementgeometry.hh b/dumux/porousmediumflow/boxdfm/fvelementgeometry.hh
index 78ee0397c81313eee59abcd1905a833517efdaf7..f2fd4cc350a2a22e7c7a12e7996f363f837d441c 100644
--- a/dumux/porousmediumflow/boxdfm/fvelementgeometry.hh
+++ b/dumux/porousmediumflow/boxdfm/fvelementgeometry.hh
@@ -70,8 +70,6 @@ public:
     using SubControlVolumeFace = typename GG::SubControlVolumeFace;
     //! Export type of finite volume grid geometry
     using GridGeometry = GG;
-    //! Export type of finite volume grid geometry
-    using FVGridGeometry [[deprecated("Use GridGeometry instead. FVGridGeometry will be removed after 3.1!")]] = GridGeometry;
 
     //! The maximum number of scvs per element (2^dim for cubes)
     //! multiplied by 3 for the maximum number of fracture scvs per vertex
@@ -152,11 +150,6 @@ public:
         eIdx_ = gridGeometry().elementMapper().index(element);
     }
 
-    //! The global finite volume geometry we are a restriction of
-    [[deprecated("Use gridGeometry() instead. fvGridGeometry() will be removed after 3.1!")]]
-    const GridGeometry& fvGridGeometry() const
-    { return *gridGeometryPtr_; }
-
     //! The global finite volume geometry we are a restriction of
     const GridGeometry& gridGeometry() const
     { return *gridGeometryPtr_; }
@@ -193,8 +186,6 @@ public:
     using SubControlVolumeFace = typename GG::SubControlVolumeFace;
     //! Export type of finite volume grid geometry
     using GridGeometry = GG;
-    //! export type of finite volume grid geometry
-    using FVGridGeometry [[deprecated("Use GridGeometry instead. FVGridGeometry will be removed after 3.1!")]] = GridGeometry;
     //! The maximum number of scvs per element (2^dim for cubes)
     //! multiplied by 3 for the maximum number of fracture scvs per vertex
     static constexpr std::size_t maxNumElementScvs = (1<<dim)*3;
@@ -272,11 +263,6 @@ public:
         makeElementGeometries(element);
     }
 
-    //! The global finite volume geometry we are a restriction of
-    [[deprecated("Use gridGeometry() instead. fvGridGeometry() will be removed after 3.1!")]]
-    const GridGeometry& fvGridGeometry() const
-    { return *gridGeometryPtr_; }
-
     //! The global finite volume geometry we are a restriction of
     const GridGeometry& gridGeometry() const
     { return *gridGeometryPtr_; }
diff --git a/dumux/porousmediumflow/boxdfm/model.hh b/dumux/porousmediumflow/boxdfm/model.hh
index df5250eaea4e3d3b87562f380840b3b7171d167e..e1a652b698b30b102cf6282ab02b687b579674b0 100644
--- a/dumux/porousmediumflow/boxdfm/model.hh
+++ b/dumux/porousmediumflow/boxdfm/model.hh
@@ -40,16 +40,9 @@ namespace TTag {
 struct BoxDfmModel { using InheritsFrom = std::tuple<BoxModel>; };
 } // end namespace TTag
 
-// Dumux 3.1 changes the property `FVGridGeometry` to `GridGeometry`.
-// For ensuring backward compatibility on the user side, it is necessary to
-// stick to the old name for the specializations, see the discussion in MR 1647.
-// Use diagnostic pragmas to prevent the emission of a warning message.
-// TODO after 3.1: Rename to GridGeometry, remove the pragmas and this comment.
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-//! Set the default for the global finite volume geometry
+//! Set the default for the grid geometry
 template<class TypeTag>
-struct FVGridGeometry<TypeTag, TTag::BoxDfmModel>
+struct GridGeometry<TypeTag, TTag::BoxDfmModel>
 {
 private:
     static constexpr bool enableCache = getPropValue<TypeTag, Properties::EnableGridGeometryCache>();
@@ -58,7 +51,6 @@ private:
 public:
     using type = BoxDfmFVGridGeometry<Scalar, GridView, enableCache>;
 };
-#pragma GCC diagnostic pop
 
 //! The flux variables cache class specific to box-dfm porous medium flow models
 template<class TypeTag>
diff --git a/dumux/porousmediumflow/sequential/properties.hh b/dumux/porousmediumflow/sequential/properties.hh
index 8710159723aca24f9abe581e3858d3271d40a588..dc9ee4b91f469aba0ec458675529d2f63521e72b 100644
--- a/dumux/porousmediumflow/sequential/properties.hh
+++ b/dumux/porousmediumflow/sequential/properties.hh
@@ -157,16 +157,9 @@ public:
     static const int value = 2*dim;
 };
 
-// Dumux 3.1 changes the property `FVGridGeometry` to `GridGeometry`.
-// For ensuring backward compatibility on the user side, it is necessary to
-// stick to the old name for the specializations, see the discussion in MR 1647.
-// Use diagnostic pragmas to prevent the emission of a warning message.
-// TODO after 3.1: Rename to GridGeometry, remove the pragmas and this comment.
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 //! A simplified grid geometry for compatibility with new style models
 template<class TypeTag>
-struct FVGridGeometry<TypeTag, TTag::SequentialModel>
+struct GridGeometry<TypeTag, TTag::SequentialModel>
 {
     struct MockFVGridGeometry
     : public DefaultMapperTraits<GetPropType<TypeTag, Properties::GridView>>
@@ -178,7 +171,6 @@ struct FVGridGeometry<TypeTag, TTag::SequentialModel>
 public:
     using type = MockFVGridGeometry;
 };
-#pragma GCC diagnostic pop
 
 //! For compatibility with new style models we need a solution vector type
 template<class TypeTag>
diff --git a/test/porousmediumflow/1p/implicit/network1d3d/problem.hh b/test/porousmediumflow/1p/implicit/network1d3d/problem.hh
index fb0523c9a05eb70c25de259095f637c6a01ab2b8..2b953729249520791e57fd9c637a95d00d7cf5d0 100644
--- a/test/porousmediumflow/1p/implicit/network1d3d/problem.hh
+++ b/test/porousmediumflow/1p/implicit/network1d3d/problem.hh
@@ -66,16 +66,9 @@ template<class TypeTag>
 struct Grid<TypeTag, TTag::TubesTest> { using type = Dune::FoamGrid<1, 3>; };
 #endif
 
-// Dumux 3.1 changes the property `FVGridGeometry` to `GridGeometry`.
-// For ensuring backward compatibility on the user side, it is necessary to
-// stick to the old name for the specializations, see the discussion in MR 1647.
-// Use diagnostic pragmas to prevent the emission of a warning message.
-// TODO after 3.1: Rename to GridGeometry, remove the pragmas and this comment.
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 // if we have pt scotch use the reordering dof mapper to optimally sort the dofs (cc)
 template<class TypeTag>
-struct FVGridGeometry<TypeTag, TTag::TubesTestCCTpfa>
+struct GridGeometry<TypeTag, TTag::TubesTestCCTpfa>
 {
 private:
     static constexpr bool enableCache = getPropValue<TypeTag, Properties::EnableGridGeometryCache>();
@@ -90,7 +83,7 @@ public:
 
 // if we have pt scotch use the reordering dof mapper to optimally sort the dofs (box)
 template<class TypeTag>
-struct FVGridGeometry<TypeTag, TTag::TubesTestBox>
+struct GridGeometry<TypeTag, TTag::TubesTestBox>
 {
 private:
     static constexpr bool enableCache = getPropValue<TypeTag, Properties::EnableGridGeometryCache>();
@@ -103,7 +96,6 @@ private:
 public:
     using type = BoxFVGridGeometry<Scalar, GridView, enableCache, BoxDefaultGridGeometryTraits<GridView, MapperTraits>>;
 };
-#pragma GCC diagnostic pop
 
 // Set the problem property
 template<class TypeTag>