diff --git a/exercises/exercise-basic/injection2pproblem.hh b/exercises/exercise-basic/injection2pproblem.hh
index 45ea8318398b99920e05579a4218eaa0ecf558c1..abe5cc188199905673dee5a3ad1813854806573d 100644
--- a/exercises/exercise-basic/injection2pproblem.hh
+++ b/exercises/exercise-basic/injection2pproblem.hh
@@ -93,10 +93,6 @@ public:
         injectionDuration_ = getParam<Scalar>("Problem.InjectionDuration");
     }
 
-    /*!
-     * \name Problem parameters
-     */
-    // \{
 
     /*!
      * \brief Returns the problem name
@@ -106,12 +102,6 @@ public:
     std::string name() const
     { return name_+"-2p"; }
 
-    // \}
-
-    /*!
-     * \name Boundary conditions
-     */
-    // \{
 
     /*!
      * \brief Specifies which kind of boundary condition should be
@@ -169,13 +159,6 @@ public:
         return values;
     }
 
-    // \}
-
-
-    /*!
-     * \name Volume terms
-     */
-    // \{
 
     /*!
      * \brief Evaluate the source term for all phases within a given
diff --git a/exercises/exercise-biomineralization/biominproblem.hh b/exercises/exercise-biomineralization/biominproblem.hh
index c5ca0c6722ba2c6a6aebc9f2a58f1ceffc6d1992..0f8d87d5227a9ecf4543a35a952edffee4af771d 100644
--- a/exercises/exercise-biomineralization/biominproblem.hh
+++ b/exercises/exercise-biomineralization/biominproblem.hh
@@ -132,10 +132,6 @@ public:
         time_ = time;
     }
 
-    /*!
-     * \name Problem parameters
-     */
-
     /*!
      * \brief The problem name.
      *
@@ -145,13 +141,6 @@ public:
     { return name_; }
 
 
-    // \}
-
-    /*!
-     * \name Boundary conditions
-     */
-    // \{
-
     /*!
      * \brief Specifies which kind of boundary condition should be
      *        used for which equation on a given boundary segment.
diff --git a/exercises/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh b/exercises/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh
index 25c35722efc503272cf48e48548befc9a223c6bd..a7984532a58d3c52b3ed907e7e275ce32980d687 100644
--- a/exercises/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh
+++ b/exercises/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh
@@ -66,10 +66,6 @@ public:
         deltaP_ = getParamFromGroup<Scalar>(this->paramGroup(), "Problem.PressureDifference");
     }
 
-   /*!
-     * \name Problem parameters
-     */
-    // \{
 
    /*!
      * \brief Return the sources within the domain.
@@ -78,12 +74,7 @@ public:
      */
     NumEqVector sourceAtPos(const GlobalPosition &globalPos) const
     { return NumEqVector(0.0); }
-    // \}
 
-   /*!
-     * \name Boundary conditions
-     */
-    // \{
 
     /*!
      * \brief Specifies which kind of boundary condition should be
@@ -172,7 +163,6 @@ public:
         return values;
     }
 
-    // \}
 
     //! Set the coupling manager
     void setCouplingManager(std::shared_ptr<CouplingManager> cm)
@@ -182,10 +172,6 @@ public:
     const CouplingManager& couplingManager() const
     { return *couplingManager_; }
 
-   /*!
-     * \name Volume terms
-     */
-    // \{
 
    /*!
      * \brief Evaluate the initial value for a control volume.
diff --git a/exercises/exercise-coupling-ff-pm/interface/porousmediumsubproblem.hh b/exercises/exercise-coupling-ff-pm/interface/porousmediumsubproblem.hh
index 28e479a25cfb36f596f705851f78e2bb4a4dc01f..836e041cbb39f40d35fd89b4deeaf6effb3170a3 100644
--- a/exercises/exercise-coupling-ff-pm/interface/porousmediumsubproblem.hh
+++ b/exercises/exercise-coupling-ff-pm/interface/porousmediumsubproblem.hh
@@ -64,17 +64,6 @@ public:
     : ParentType(fvGridGeometry, "Darcy"), eps_(1e-7), couplingManager_(couplingManager)
     {}
 
-    /*!
-     * \name Simulation steering
-     */
-    // \{
-
-    // \}
-
-    /*!
-     * \name Boundary conditions
-     */
-    // \{
 
     /*!
       * \brief Specifies which kind of boundary condition should be
@@ -145,12 +134,6 @@ public:
         return values;
     }
 
-    // \}
-
-    /*!
-     * \name Volume terms
-     */
-    // \{
     /*!
      * \brief Evaluate the source term for all phases within a given
      *        sub-control-volume.
diff --git a/exercises/exercise-coupling-ff-pm/models/freeflowsubproblem.hh b/exercises/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
index a2801741efb00dc9f67bd17a3abec7740164e343..57d749f2b05a1be9e324c66b18c7cf4b9181ead3 100644
--- a/exercises/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
+++ b/exercises/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
@@ -77,10 +77,6 @@ public:
         moleFraction_ = getParamFromGroup<Scalar>(this->paramGroup(), "Problem.MoleFraction");
     }
 
-   /*!
-     * \name Problem parameters
-     */
-    // \{
 
    /*!
      * \brief Return the sources within the domain.
@@ -90,11 +86,6 @@ public:
     NumEqVector sourceAtPos(const GlobalPosition &globalPos) const
     { return NumEqVector(0.0); }
 
-    // \}
-   /*!
-     * \name Boundary conditions
-     */
-    // \{
 
     /*!
      * \brief Specifies which kind of boundary condition should be
@@ -182,7 +173,6 @@ public:
         return values;
     }
 
-    // \}
 
     /*!
      * \brief Set the coupling manager
@@ -196,10 +186,6 @@ public:
     const CouplingManager& couplingManager() const
     { return *couplingManager_; }
 
-   /*!
-     * \name Volume terms
-     */
-    // \{
 
    /*!
      * \brief Evaluate the initial value for a control volume.
diff --git a/exercises/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh b/exercises/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh
index 15e0d79d065a6b625f580c6b13ef8de88570a0d0..6a9a1fa85eded93c86c1e8befad1f13fcf9b889f 100644
--- a/exercises/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh
+++ b/exercises/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh
@@ -95,10 +95,6 @@ public:
                      << std::endl;
     }
 
-    /*!
-     * \name Simulation steering
-     */
-    // \{
 
     /*!
      * \brief Initialize the problem.
@@ -223,10 +219,6 @@ public:
         }
     }
 
-    /*!
-     * \name Boundary conditions
-     */
-    // \{
 
     /*!
       * \brief Specifies which kind of boundary condition should be
@@ -271,12 +263,6 @@ public:
         return values;
     }
 
-    // \}
-
-    /*!
-     * \name Volume terms
-     */
-    // \{
     /*!
      * \brief Evaluate the source term for all phases within a given
      *        sub-control-volume.
@@ -293,7 +279,6 @@ public:
                        const SubControlVolume& scv) const
     { return NumEqVector(0.0); }
 
-    // \}
 
     /*!
      * \brief Evaluate the initial value for a control volume.
diff --git a/exercises/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh b/exercises/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
index 7684d323ec75fca55f0fb37d079d8998e3965c82..3d2cdaf6e1b2e044c95d722e31e2e6673a08459a 100644
--- a/exercises/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
+++ b/exercises/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
@@ -87,10 +87,6 @@ public:
                                                                      getParamFromGroup<std::string>(this->paramGroup(), "Problem.InterfaceDiffusionCoefficientAvg"));
     }
 
-   /*!
-     * \name Problem parameters
-     */
-    // \{
 
    /*!
      * \brief Return the sources within the domain.
@@ -100,11 +96,6 @@ public:
     NumEqVector sourceAtPos(const GlobalPosition &globalPos) const
     { return NumEqVector(0.0); }
 
-    // \}
-   /*!
-     * \name Boundary conditions
-     */
-    // \{
 
     /*!
      * \brief Specifies which kind of boundary condition should be
@@ -210,7 +201,6 @@ public:
         return values;
     }
 
-    // \}
 
     /*!
      * \brief Set the coupling manager
@@ -224,10 +214,6 @@ public:
     const CouplingManager& couplingManager() const
     { return *couplingManager_; }
 
-   /*!
-     * \name Volume terms
-     */
-    // \{
 
    /*!
      * \brief Evaluate the initial value for a control volume.
diff --git a/exercises/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh b/exercises/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh
index 328b727630bfbeda5e802f2707ea7cdd45ccdc41..5d989c367192c6fe81776a07768e540357fe08c3 100644
--- a/exercises/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh
+++ b/exercises/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh
@@ -89,10 +89,6 @@ public:
                                                                      getParamFromGroup<std::string>(this->paramGroup(), "Problem.InterfaceDiffusionCoefficientAvg"));
     }
 
-    /*!
-     * \name Simulation steering
-     */
-    // \{
 
     template<class SolutionVector, class GridVariables>
     void postTimeStep(const SolutionVector& curSol,
@@ -126,12 +122,6 @@ public:
         std::cout << "mass of water is: " << massWater << std::endl;
     }
 
-    // \}
-
-     /*!
-     * \name Boundary conditions
-     */
-    // \{
     /*!
       * \brief Specifies which kind of boundary condition should be
       *        used for which equation on a given boundary control volume.
@@ -197,12 +187,6 @@ public:
         return values;
     }
 
-    // \}
-
-    /*!
-     * \name Volume terms
-     */
-    // \{
     /*!
      * \brief Evaluate the source term for all phases within a given
      *        sub-control-volume.
diff --git a/exercises/exercise-fluidsystem/2p2cproblem.hh b/exercises/exercise-fluidsystem/2p2cproblem.hh
index 73167b684902cf11a5d9a9d372e0f792043b24c3..c2b105b3e79468495b0f58700a00a131dcb6bb28 100644
--- a/exercises/exercise-fluidsystem/2p2cproblem.hh
+++ b/exercises/exercise-fluidsystem/2p2cproblem.hh
@@ -73,10 +73,6 @@ public:
         depthBOR_ = this->gridGeometry().bBoxMax()[dimWorld-1];
     }
 
-     /*!
-     * \name Boundary conditions
-     */
-    // \{
 
     /*!
      * \brief Specifies which kind of boundary condition should be
@@ -137,12 +133,6 @@ public:
         return values;
     }
 
-    // \}
-
-    /*!
-     * \name Volume terms
-     */
-    // \{
 
     /*!
      * \brief Evaluate the initial value for a control volume.
@@ -168,7 +158,6 @@ public:
         return values;
     }
 
-    // \}
 
     /*!
      * \brief Returns the source term
diff --git a/exercises/exercise-fluidsystem/2pproblem.hh b/exercises/exercise-fluidsystem/2pproblem.hh
index fc8359c75678279ea5b3147f4b1b53738a18388c..fcfa66fcb11129b35912d3db4077ab8b98963244 100644
--- a/exercises/exercise-fluidsystem/2pproblem.hh
+++ b/exercises/exercise-fluidsystem/2pproblem.hh
@@ -96,10 +96,6 @@ public:
             plotDensity_();
     }
 
-     /*!
-     * \name Boundary conditions
-     */
-    // \{
 
     /*!
      * \brief Specifies which kind of boundary condition should be
@@ -163,12 +159,6 @@ public:
         return values;
     }
 
-    // \}
-
-    /*!
-     * \name Volume terms
-     */
-    // \{
 
     /*!
      * \brief Evaluate the initial value for a control volume.
@@ -189,7 +179,7 @@ public:
 
         return values;
     }
-    // \}
+
 
     /*!
      * \brief Returns the source term
diff --git a/exercises/exercise-grids/problem.hh b/exercises/exercise-grids/problem.hh
index c251e4666b72513ac17cf269fcc8bd723db79b1b..6fac2f88af57889d718e7b1a95a5b7e7f48579e1 100644
--- a/exercises/exercise-grids/problem.hh
+++ b/exercises/exercise-grids/problem.hh
@@ -93,10 +93,6 @@ public:
         injectionDuration_ = getParam<Scalar>("Problem.InjectionDuration");
     }
 
-    /*!
-     * \name Problem parameters
-     */
-    // \{
 
     /*!
      * \brief Returns the problem name
@@ -106,12 +102,6 @@ public:
     std::string name() const
     { return name_+"-2p"; }
 
-    // \}
-
-    /*!
-     * \name Boundary conditions
-     */
-    // \{
 
     /*!
      * \brief Specifies which kind of boundary condition should be
@@ -169,13 +159,6 @@ public:
         return values;
     }
 
-    // \}
-
-
-    /*!
-     * \name Volume terms
-     */
-    // \{
 
     /*!
      * \brief Evaluate the initial value for a control volume.
diff --git a/exercises/exercise-runtimeparams/problem.hh b/exercises/exercise-runtimeparams/problem.hh
index 2854c68f55e3cabd9e7f25e0ec078f88251ef7b0..0841e67a4396530eafbd43d022f92a0949e4d186 100644
--- a/exercises/exercise-runtimeparams/problem.hh
+++ b/exercises/exercise-runtimeparams/problem.hh
@@ -101,10 +101,6 @@ public:
         // Provide output describing where the parameter value comes from using parameter bool functions.
     }
 
-    /*!
-     * \name Problem parameters
-     */
-    // \{
 
     /*!
      * \brief Returns the problem name
@@ -114,12 +110,6 @@ public:
     std::string name() const
     { return name_+"-2p"; }
 
-    // \}
-
-    /*!
-     * \name Boundary conditions
-     */
-    // \{
 
     /*!
      * \brief Specifies which kind of boundary condition should be
@@ -179,12 +169,6 @@ public:
         return values;
     }
 
-    // \}
-
-    /*!
-     * \name Volume terms
-     */
-    // \{
 
     /*!
      * \brief Evaluate the initial value for a control volume.
diff --git a/exercises/solution/exercise-biomineralization/biominproblem.hh b/exercises/solution/exercise-biomineralization/biominproblem.hh
index 70a4db8a37c187c2115f4010008f8799d9c5a4df..f2f3d626644cf6dbd021bea78b28f58a3a1f96d3 100644
--- a/exercises/solution/exercise-biomineralization/biominproblem.hh
+++ b/exercises/solution/exercise-biomineralization/biominproblem.hh
@@ -135,10 +135,6 @@ public:
         time_ = time;
     }
 
-    /*!
-     * \name Problem parameters
-     */
-
     /*!
      * \brief The problem name.
      *
@@ -147,12 +143,6 @@ public:
     const std::string name() const
     { return name_; }
 
-    // \}
-
-    /*!
-     * \name Boundary conditions
-     */
-    // \{
 
     /*!
      * \brief Specifies which kind of boundary condition should be
diff --git a/exercises/solution/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh b/exercises/solution/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh
index 18fbcbdfdc87ef8697360d878c7efbde89c0206f..2438cadae30a813c3e5c6fa65a360f832bfd6a5d 100644
--- a/exercises/solution/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh
@@ -67,10 +67,6 @@ public:
         deltaP_ = getParamFromGroup<Scalar>(this->paramGroup(), "Problem.PressureDifference");
     }
 
-   /*!
-     * \name Problem parameters
-     */
-    // \{
 
    /*!
      * \brief Return the sources within the domain.
@@ -79,12 +75,7 @@ public:
      */
     NumEqVector sourceAtPos(const GlobalPosition &globalPos) const
     { return NumEqVector(0.0); }
-    // \}
 
-   /*!
-     * \name Boundary conditions
-     */
-    // \{
 
     /*!
      * \brief Specifies which kind of boundary condition should be
@@ -191,7 +182,6 @@ public:
         return values;
     }
 
-    // \}
 
     //! Set the coupling manager
     void setCouplingManager(std::shared_ptr<CouplingManager> cm)
@@ -201,10 +191,6 @@ public:
     const CouplingManager& couplingManager() const
     { return *couplingManager_; }
 
-   /*!
-     * \name Volume terms
-     */
-    // \{
 
    /*!
      * \brief Evaluate the initial value for a control volume.
diff --git a/exercises/solution/exercise-coupling-ff-pm/interface/porousmediumsubproblem.hh b/exercises/solution/exercise-coupling-ff-pm/interface/porousmediumsubproblem.hh
index 49667908407c990bded2bfce8f412d790a3e1056..173c5c9d5a0b20f5fb8ce097d75ff6b445206434 100644
--- a/exercises/solution/exercise-coupling-ff-pm/interface/porousmediumsubproblem.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/interface/porousmediumsubproblem.hh
@@ -64,17 +64,6 @@ public:
     : ParentType(fvGridGeometry, "Darcy"), eps_(1e-7), couplingManager_(couplingManager)
     {}
 
-    /*!
-     * \name Simulation steering
-     */
-    // \{
-
-    // \}
-
-    /*!
-     * \name Boundary conditions
-     */
-    // \{
 
     /*!
       * \brief Specifies which kind of boundary condition should be
@@ -140,12 +129,6 @@ public:
         return values;
     }
 
-    // \}
-
-    /*!
-     * \name Volume terms
-     */
-    // \{
     /*!
      * \brief Evaluate the source term for all phases within a given
      *        sub-control-volume.
diff --git a/exercises/solution/exercise-coupling-ff-pm/models/freeflowsubproblem.hh b/exercises/solution/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
index ffc950c3b89efec5b9cea954f3f927d1e456ae18..fca504852d8783857b8b50bc90fadee323ed6c45 100644
--- a/exercises/solution/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
@@ -80,10 +80,6 @@ public:
         moleFraction_ = getParamFromGroup<Scalar>(this->paramGroup(), "Problem.MoleFraction");
     }
 
-   /*!
-     * \name Problem parameters
-     */
-    // \{
 
    /*!
      * \brief Return the sources within the domain.
@@ -93,11 +89,6 @@ public:
     NumEqVector sourceAtPos(const GlobalPosition &globalPos) const
     { return NumEqVector(0.0); }
 
-    // \}
-   /*!
-     * \name Boundary conditions
-     */
-    // \{
 
     /*!
      * \brief Specifies which kind of boundary condition should be
@@ -185,7 +176,6 @@ public:
         return values;
     }
 
-    // \}
 
     /*!
      * \brief Set the coupling manager
@@ -199,10 +189,6 @@ public:
     const CouplingManager& couplingManager() const
     { return *couplingManager_; }
 
-   /*!
-     * \name Volume terms
-     */
-    // \{
 
     /*!
       * \brief Evaluate the initial value for a control volume.
diff --git a/exercises/solution/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh b/exercises/solution/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh
index 2c1be471bb7b53e80b1441a0597696df8df54f28..cfc1e08520f7130537051882defa8e9b34878c68 100644
--- a/exercises/solution/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh
@@ -103,10 +103,6 @@ public:
                      << std::endl;
     }
 
-    /*!
-     * \name Simulation steering
-     */
-    // \{
 
     /*!
      * \brief Initialize the problem.
@@ -244,10 +240,6 @@ public:
         }
     }
 
-    /*!
-     * \name Boundary conditions
-     */
-    // \{
 
     /*!
       * \brief Specifies which kind of boundary condition should be
@@ -292,12 +284,6 @@ public:
         return values;
     }
 
-    // \}
-
-    /*!
-     * \name Volume terms
-     */
-    // \{
     /*!
      * \brief Evaluate the source term for all phases within a given
      *        sub-control-volume.
@@ -314,7 +300,6 @@ public:
                        const SubControlVolume& scv) const
     { return NumEqVector(0.0); }
 
-    // \}
 
     /*!
      * \brief Evaluate the initial value for a control volume.
diff --git a/exercises/solution/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh b/exercises/solution/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
index 12e75ae27b09be0ebe23b66fe14961df4b536a18..cfba40383d607ea9797221682cbe1fd7b2e1fe56 100644
--- a/exercises/solution/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
@@ -97,10 +97,6 @@ public:
                                                                      getParamFromGroup<std::string>(this->paramGroup(), "Problem.InterfaceDiffusionCoefficientAvg"));
     }
 
-   /*!
-     * \name Problem parameters
-     */
-    // \{
 
    /*!
      * \brief Return the sources within the domain.
@@ -110,11 +106,6 @@ public:
     NumEqVector sourceAtPos(const GlobalPosition &globalPos) const
     { return NumEqVector(0.0); }
 
-    // \}
-   /*!
-     * \name Boundary conditions
-     */
-    // \{
 
     /*!
      * \brief Specifies which kind of boundary condition should be
@@ -230,7 +221,6 @@ public:
         return values;
     }
 
-    // \}
 
     /*!
      * \brief Set the coupling manager
@@ -244,10 +234,6 @@ public:
     const CouplingManager& couplingManager() const
     { return *couplingManager_; }
 
-   /*!
-     * \name Volume terms
-     */
-    // \{
 
    /*!
      * \brief Evaluate the initial value for a control volume.
diff --git a/exercises/solution/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh b/exercises/solution/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh
index 0d8a5b607f2db8a3304cad107898591411a66e1c..456f9b14fac589d5b233dfb87c073f5ad3a054d5 100644
--- a/exercises/solution/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh
@@ -89,10 +89,6 @@ public:
                                                                      getParamFromGroup<std::string>(this->paramGroup(), "Problem.InterfaceDiffusionCoefficientAvg"));
     }
 
-    /*!
-     * \name Simulation steering
-     */
-    // \{
 
     template<class SolutionVector, class GridVariables>
     void postTimeStep(const SolutionVector& curSol,
@@ -126,12 +122,6 @@ public:
         std::cout << "mass of water is: " << massWater << std::endl;
     }
 
-    // \}
-
-     /*!
-     * \name Boundary conditions
-     */
-    // \{
     /*!
       * \brief Specifies which kind of boundary condition should be
       *        used for which equation on a given boundary control volume.
@@ -197,12 +187,6 @@ public:
         return values;
     }
 
-    // \}
-
-    /*!
-     * \name Volume terms
-     */
-    // \{
     /*!
      * \brief Evaluate the source term for all phases within a given
      *        sub-control-volume.
diff --git a/exercises/solution/exercise-fluidsystem/2p2cproblem.hh b/exercises/solution/exercise-fluidsystem/2p2cproblem.hh
index 00e52975ea6aef04cfbe1ef38e341aa123f71e36..8b26c8850f484f274aedb8cefdc0a07f864cc415 100644
--- a/exercises/solution/exercise-fluidsystem/2p2cproblem.hh
+++ b/exercises/solution/exercise-fluidsystem/2p2cproblem.hh
@@ -72,10 +72,6 @@ public:
         depthBOR_ = this->gridGeometry().bBoxMax()[dimWorld-1];
     }
 
-     /*!
-     * \name Boundary conditions
-     */
-    // \{
 
     /*!
      * \brief Specifies which kind of boundary condition should be
@@ -142,12 +138,6 @@ public:
         return values;
     }
 
-    // \}
-
-    /*!
-     * \name Volume terms
-     */
-    // \{
 
     /*!
      * \brief Evaluate the initial value for a control volume.
@@ -174,7 +164,6 @@ public:
         return values;
     }
 
-    // \}
 
     /*!
      * \brief Returns the source term
diff --git a/exercises/solution/exercise-fluidsystem/2pproblem.hh b/exercises/solution/exercise-fluidsystem/2pproblem.hh
index fc1efe3a224b2748b0fd29edff378905ef23e589..ba335303f934200548d23957a51d4bd198dcab2d 100644
--- a/exercises/solution/exercise-fluidsystem/2pproblem.hh
+++ b/exercises/solution/exercise-fluidsystem/2pproblem.hh
@@ -96,10 +96,6 @@ public:
             plotDensity_();
     }
 
-     /*!
-     * \name Boundary conditions
-     */
-    // \{
 
     /*!
      * \brief Specifies which kind of boundary condition should be
@@ -166,12 +162,6 @@ public:
         return values;
     }
 
-    // \}
-
-    /*!
-     * \name Volume terms
-     */
-    // \{
 
     /*!
      * \brief Evaluate the initial value for a control volume.
@@ -192,7 +182,7 @@ public:
 
         return values;
     }
-    // \}
+
 
     /*!
      * \brief Returns the source term
diff --git a/exercises/solution/exercise-grids/problem.hh b/exercises/solution/exercise-grids/problem.hh
index ae1edae3b17c2a341385f989b4a7b2936be2bf1a..ae74c340b4194033bdd92bd0083142ceee861c10 100644
--- a/exercises/solution/exercise-grids/problem.hh
+++ b/exercises/solution/exercise-grids/problem.hh
@@ -93,10 +93,6 @@ public:
         injectionDuration_ = getParam<Scalar>("Problem.InjectionDuration");
     }
 
-    /*!
-     * \name Problem parameters
-     */
-    // \{
 
     /*!
      * \brief Returns the problem name
@@ -106,12 +102,6 @@ public:
     std::string name() const
     { return name_+"-2p"; }
 
-    // \}
-
-    /*!
-     * \name Boundary conditions
-     */
-    // \{
 
     /*!
      * \brief Specifies which kind of boundary condition should be
@@ -169,13 +159,6 @@ public:
         return values;
     }
 
-    // \}
-
-
-    /*!
-     * \name Volume terms
-     */
-    // \{
 
     /*!
      * \brief Evaluate the initial value for a control volume.
diff --git a/exercises/solution/exercise-runtimeparams/problem.hh b/exercises/solution/exercise-runtimeparams/problem.hh
index bb9ea65db590dcd335c75981f5421fb220f916bf..e8714c959d7cc9025edec07363d4cbbc6b07db0a 100644
--- a/exercises/solution/exercise-runtimeparams/problem.hh
+++ b/exercises/solution/exercise-runtimeparams/problem.hh
@@ -102,10 +102,6 @@ public:
 //             std::cout << "Using the default parameter value." << std::endl;
     }
 
-    /*!
-     * \name Problem parameters
-     */
-    // \{
 
     /*!
      * \brief Returns the problem name
@@ -115,12 +111,6 @@ public:
     std::string name() const
     { return name_+"-2p"; }
 
-    // \}
-
-    /*!
-     * \name Boundary conditions
-     */
-    // \{
 
     /*!
      * \brief Specifies which kind of boundary condition should be
@@ -179,12 +169,6 @@ public:
         return values;
     }
 
-    // \}
-
-    /*!
-     * \name Volume terms
-     */
-    // \{
 
     /*!
      * \brief Evaluate the initial value for a control volume.