diff --git a/dumux/freeflow/stokes/localresidual.hh b/dumux/freeflow/stokes/localresidual.hh
index cbe9c0825b996447c97584941e2c400a3fb5c122..a8ecd19886de161acb65ef25279fd50d9b78de90 100644
--- a/dumux/freeflow/stokes/localresidual.hh
+++ b/dumux/freeflow/stokes/localresidual.hh
@@ -477,7 +477,7 @@ protected:
 
                     const DimVector& elementUnitNormal = isIt->centerUnitOuterNormal();
 
-                    tangent[0] = elementUnitNormal[1];  //TODO: 3D
+                    tangent[0] = elementUnitNormal[1];
                     tangent[1] = -elementUnitNormal[0];
 
                     Dune::FieldMatrix<Scalar, dim, dim> velGrad = boundaryVars.velocityGrad();
diff --git a/dumux/implicit/box/fvelementgeometry.hh b/dumux/implicit/box/fvelementgeometry.hh
index 82446c27af7aff554436999cba1cce2e017daf10..d4a4095beb9b377054a332d6f559246634e96503 100644
--- a/dumux/implicit/box/fvelementgeometry.hh
+++ b/dumux/implicit/box/fvelementgeometry.hh
@@ -846,10 +846,6 @@ public:
         }
 
         // fill sub control volume data use specialization for this
-        // \todo maybe it would be a good idea to migrate everything
-        // which is dependend of the grid's dimension to
-        // _BoxFVElemGeomHelper in order to benefit from more aggressive
-        // compiler optimizations...
         BoxFVElemGeomHelper::fillSubContVolData(*this, numScv, edgeCoordinates, faceCoordinates);
         subContVolGeometries.clear();
         BoxFVElemGeomHelper::template computeGeometries<BoxGeometry>(*this, numScv, edgeCoordinates, faceCoordinates);
diff --git a/dumux/io/gnuplotinterface.hh b/dumux/io/gnuplotinterface.hh
index 6d8c3884342fd1081efb03db3b1c1f115ef82afa..8a729c3757b525627adeed07571322a3cd8685ab 100644
--- a/dumux/io/gnuplotinterface.hh
+++ b/dumux/io/gnuplotinterface.hh
@@ -24,9 +24,6 @@
  *
  * The data sets for a specific window have to be passed by the addDataSet function
  * and then plotted by using the plot function.
- *
- * \todo the use of the plottingWindowNumber in each function could be replaced, but
- *       a new GnuplotInterface object has to be created for each plot
  */
 
 #ifndef DUMUX_GNUPLOT_INTERFACE_HH
diff --git a/dumux/material/binarycoefficients/henryiapws.hh b/dumux/material/binarycoefficients/henryiapws.hh
index 5f5997f3a0dec94483671621bb18f6ed580fff9d..d59fb1e09a4b92d7898d148ed1e1e7b1cf17f15e 100644
--- a/dumux/material/binarycoefficients/henryiapws.hh
+++ b/dumux/material/binarycoefficients/henryiapws.hh
@@ -88,9 +88,7 @@ inline Scalar henryIAPWS(Scalar E,
          G*pow(tau, 2.0/3) +
          H*tau)*
         exp((H2O::tripleTemperature() - temperature)/100);
-    // CAUTION: K_D is formulated in mole fractions. We have to
-    // multiply it with the vapor pressure of water in order to get
-    // derivative of the partial pressure.
+
     return exp(exponent)*H2O::vaporPressure(temperature);
 }
 }
diff --git a/dumux/material/fluidsystems/brineco2.hh b/dumux/material/fluidsystems/brineco2.hh
index 2a57d410ff8597034e5b6911c647dd22d5bb3c24..8856e21bbb7221d601453673ce2ec2fb3f2554a3 100644
--- a/dumux/material/fluidsystems/brineco2.hh
+++ b/dumux/material/fluidsystems/brineco2.hh
@@ -356,8 +356,7 @@ public:
         assert(pressure > 0);
 
         // calulate the equilibrium composition for the given
-        // temperature and pressure. TODO: calculateMoleFractions()
-        // could use some cleanup.
+        // temperature and pressure.
         Scalar xlH2O, xgH2O;
         Scalar xlCO2, xgCO2;
         Brine_CO2::calculateMoleFractions(temperature,
diff --git a/dumux/porousmediumflow/2pncmin/implicit/model.hh b/dumux/porousmediumflow/2pncmin/implicit/model.hh
index a2b496ce9b3dd9300cbc573997dac4cefd9d65de..27dcb4970c90c5a51d66f0e972c8ff1c661608e6 100644
--- a/dumux/porousmediumflow/2pncmin/implicit/model.hh
+++ b/dumux/porousmediumflow/2pncmin/implicit/model.hh
@@ -481,8 +481,6 @@ protected:
             {
             Scalar sumxl = 0;
             //Calculate sum of mole fractions (water and air) in the hypothetical liquid phase
-            //WARNING: Here numComponents is replaced by numMajorComponents as the solutes
-            //are only present in the liquid phase and cannot condense as the liquid (water).
             for (int compIdx = 0; compIdx < numComponents; compIdx++)
                 {
                     sumxl += volVars.moleFraction(wPhaseIdx, compIdx);