diff --git a/dumux/common/parameters.hh b/dumux/common/parameters.hh
index d954c3e98f676aab89fece294269d1e22e1062af..cb186d4b4c69c7ef38f611f41c43795b3ead0984 100644
--- a/dumux/common/parameters.hh
+++ b/dumux/common/parameters.hh
@@ -19,9 +19,7 @@
 /*!
  * \file
  * \ingroup Common
- * \brief The infrastructure to retrieve run-time parameters from
- *        Dune::ParameterTrees with the defaul value taken from the
- *        property system.
+ * \brief The infrastructure to retrieve run-time parameters from Dune::ParameterTrees.
  */
 #ifndef DUMUX_PARAMETERS_HH
 #define DUMUX_PARAMETERS_HH
diff --git a/dumux/discretization/basefvgridgeometry.hh b/dumux/discretization/basefvgridgeometry.hh
index 93e53b44c5a4a27b87d7db1c6f9128847023de23..7d50774734d35794fc234c09988eed790f7fe57b 100644
--- a/dumux/discretization/basefvgridgeometry.hh
+++ b/dumux/discretization/basefvgridgeometry.hh
@@ -26,7 +26,6 @@
 
 #include <dune/grid/common/mcmgmapper.hh>
 
-#include <dumux/common/properties.hh>
 #include <dumux/common/entitymap.hh>
 #include <dumux/common/geometry/boundingboxtree.hh>
 #include <dumux/common/geometry/geometricentityset.hh>
diff --git a/dumux/discretization/cellcentered/mpfa/connectivitymap.hh b/dumux/discretization/cellcentered/mpfa/connectivitymap.hh
index 47bcc5d4c0095b89a949b0e260aef97ebfae2aae..bdabfdc168681f60e6fce3d44189db6d10c88dfe 100644
--- a/dumux/discretization/cellcentered/mpfa/connectivitymap.hh
+++ b/dumux/discretization/cellcentered/mpfa/connectivitymap.hh
@@ -27,7 +27,6 @@
 #ifndef DUMUX_CC_MPFA_CONNECTIVITY_MAP_HH
 #define DUMUX_CC_MPFA_CONNECTIVITY_MAP_HH
 
-#include <dumux/common/properties.hh>
 #include <dumux/discretization/cellcentered/mpfa/methods.hh>
 #include <dumux/discretization/cellcentered/connectivitymap.hh>
 
diff --git a/dumux/discretization/cellcentered/mpfa/omethod/localassembler.hh b/dumux/discretization/cellcentered/mpfa/omethod/localassembler.hh
index 7cb4fa1b2e099d7da53f608782919e51bd052782..c0c35e8d7dd2a026870e9aff6b50d870d54f8422 100644
--- a/dumux/discretization/cellcentered/mpfa/omethod/localassembler.hh
+++ b/dumux/discretization/cellcentered/mpfa/omethod/localassembler.hh
@@ -26,7 +26,6 @@
 #define DUMUX_DISCRETIZATION_CC_MPFA_O_LOCAL_ASSEMBLER_HH
 
 #include <dumux/common/math.hh>
-#include <dumux/common/properties.hh>
 #include <dumux/common/matrixvectorhelper.hh>
 
 #include <dumux/discretization/cellcentered/mpfa/methods.hh>
diff --git a/dumux/discretization/cellcentered/mpfa/omethod/localsubcontrolentities.hh b/dumux/discretization/cellcentered/mpfa/omethod/localsubcontrolentities.hh
index bdb6c9b39b783cfcef9b65b741581b438efefcb2..32f2775f43c9ee69e5e298ece62bcfdcb7870716 100644
--- a/dumux/discretization/cellcentered/mpfa/omethod/localsubcontrolentities.hh
+++ b/dumux/discretization/cellcentered/mpfa/omethod/localsubcontrolentities.hh
@@ -25,7 +25,6 @@
 #define DUMUX_DISCRETIZATION_CC_MPFA_O_LOCAL_SUBCONTROLENTITIES_HH
 
 #include <dune/common/fvector.hh>
-#include <dumux/common/properties.hh>
 
 namespace Dumux
 {
diff --git a/dumux/discretization/staggered/freeflow/staggeredgeometryhelper.hh b/dumux/discretization/staggered/freeflow/staggeredgeometryhelper.hh
index 4050e7872263546fbc33299a2bfb3d48d380d1ad..326cc45d3154d951ebbaddeb16c0125d8b23d7e1 100644
--- a/dumux/discretization/staggered/freeflow/staggeredgeometryhelper.hh
+++ b/dumux/discretization/staggered/freeflow/staggeredgeometryhelper.hh
@@ -27,7 +27,6 @@
 #include <dune/geometry/multilineargeometry.hh>
 #include <dune/geometry/referenceelements.hh>
 
-#include <dumux/common/properties.hh>
 #include <dumux/common/math.hh>
 #include <type_traits>
 #include <algorithm>
diff --git a/dumux/discretization/staggered/freeflow/subcontrolvolumeface.hh b/dumux/discretization/staggered/freeflow/subcontrolvolumeface.hh
index e43857366c85f141f8c5f1bf1a0e5d3e8edb2a56..8a0daf073fb49c4ea8aff1096fa658e42f3d1cd5 100644
--- a/dumux/discretization/staggered/freeflow/subcontrolvolumeface.hh
+++ b/dumux/discretization/staggered/freeflow/subcontrolvolumeface.hh
@@ -30,7 +30,6 @@
 #include <dumux/discretization/subcontrolvolumefacebase.hh>
 #include <dumux/discretization/staggered/subcontrolvolumeface.hh>
 #include <dumux/discretization/staggered/freeflow/staggeredgeometryhelper.hh>
-#include <dumux/common/properties.hh>
 
 #include <typeinfo>
 
diff --git a/dumux/discretization/staggered/subcontrolvolumeface.hh b/dumux/discretization/staggered/subcontrolvolumeface.hh
index a1ed7450d89d5963da3eb110b9a8defe4689e8f5..aab84338e838c1706724c5000d41dd88bfee2343 100644
--- a/dumux/discretization/staggered/subcontrolvolumeface.hh
+++ b/dumux/discretization/staggered/subcontrolvolumeface.hh
@@ -29,7 +29,6 @@
 #include <dune/geometry/type.hh>
 
 #include <dumux/discretization/subcontrolvolumefacebase.hh>
-#include <dumux/common/properties.hh>
 #include <dumux/common/optional.hh>
 
 #include <typeinfo>
diff --git a/dumux/freeflow/compositional/vtkoutputfields.hh b/dumux/freeflow/compositional/vtkoutputfields.hh
index bfd5f54dffc328839d1e2ced521708c1f829b374..78927b11bce0ab898c747b0ecb0c1225fe18f927 100644
--- a/dumux/freeflow/compositional/vtkoutputfields.hh
+++ b/dumux/freeflow/compositional/vtkoutputfields.hh
@@ -24,7 +24,6 @@
 #ifndef DUMUX_FREEFLOW_NC_VTK_OUTPUT_FIELDS_HH
 #define DUMUX_FREEFLOW_NC_VTK_OUTPUT_FIELDS_HH
 
-#include <dumux/common/properties.hh>
 #include <dumux/freeflow/navierstokes/vtkoutputfields.hh>
 
 namespace Dumux
diff --git a/dumux/freeflow/navierstokes/vtkoutputfields.hh b/dumux/freeflow/navierstokes/vtkoutputfields.hh
index 04941b8ee3ba30d795cbf14dbce69977217efc6a..7d21deae4b0497f9ce262b11ccc8979bfbb21613 100644
--- a/dumux/freeflow/navierstokes/vtkoutputfields.hh
+++ b/dumux/freeflow/navierstokes/vtkoutputfields.hh
@@ -25,7 +25,6 @@
 #define DUMUX_NAVIER_STOKES_VTK_OUTPUT_FIELDS_HH
 
 #include <dune/common/fvector.hh>
-#include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/discretization/methods.hh>
 
diff --git a/dumux/freeflow/nonisothermal/vtkoutputfields.hh b/dumux/freeflow/nonisothermal/vtkoutputfields.hh
index b686b263420f98d77c030e652e7e3f8073e0aeb8..02773d6713ff43e6e7f86a789ab1a4ea0b732f3c 100644
--- a/dumux/freeflow/nonisothermal/vtkoutputfields.hh
+++ b/dumux/freeflow/nonisothermal/vtkoutputfields.hh
@@ -24,8 +24,6 @@
 #ifndef DUMUX_FREEFLOW_NI_OUTPUT_FIELDS_HH
 #define DUMUX_FREEFLOW_NI_OUTPUT_FIELDS_HH
 
-#include <dumux/common/properties.hh>
-
 namespace Dumux
 {
 
diff --git a/dumux/freeflow/rans/twoeq/kepsilon/volumevariables.hh b/dumux/freeflow/rans/twoeq/kepsilon/volumevariables.hh
index 7f5e1bbad4b9160b12bd90861336c493f3bd77e2..34cd99325db0e539440384086e79c54d57d7b7b6 100644
--- a/dumux/freeflow/rans/twoeq/kepsilon/volumevariables.hh
+++ b/dumux/freeflow/rans/twoeq/kepsilon/volumevariables.hh
@@ -25,7 +25,6 @@
 #ifndef DUMUX_KEPSILON_VOLUME_VARIABLES_HH
 #define DUMUX_KEPSILON_VOLUME_VARIABLES_HH
 
-#include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/material/fluidstates/immiscible.hh>
 #include <dumux/freeflow/rans/volumevariables.hh>
diff --git a/dumux/freeflow/rans/twoeq/lowrekepsilon/volumevariables.hh b/dumux/freeflow/rans/twoeq/lowrekepsilon/volumevariables.hh
index f72b152feea97d6750a4b03bf0f4656bd53de00c..c8bec8f87942052d5a905297a2e6d54280478551 100644
--- a/dumux/freeflow/rans/twoeq/lowrekepsilon/volumevariables.hh
+++ b/dumux/freeflow/rans/twoeq/lowrekepsilon/volumevariables.hh
@@ -25,7 +25,6 @@
 #ifndef DUMUX_LOWREKEPSILON_VOLUME_VARIABLES_HH
 #define DUMUX_LOWREKEPSILON_VOLUME_VARIABLES_HH
 
-#include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/material/fluidstates/immiscible.hh>
 #include <dumux/freeflow/rans/volumevariables.hh>
diff --git a/dumux/freeflow/volumevariables.hh b/dumux/freeflow/volumevariables.hh
index a391ef0bd07e31c4d4517c3d06268d21f590367d..7fe634f3e705e1aed0103aa7f54d351a0c76529c 100644
--- a/dumux/freeflow/volumevariables.hh
+++ b/dumux/freeflow/volumevariables.hh
@@ -25,7 +25,6 @@
 #ifndef DUMUX_FREEFLOW_VOLUME_VARIABLES_HH
 #define DUMUX_FREEFLOW_VOLUME_VARIABLES_HH
 
-#include <dumux/common/properties.hh>
 #include <dumux/material/fluidstates/immiscible.hh>
 
 namespace Dumux {
diff --git a/dumux/io/adaptivegridrestart.hh b/dumux/io/adaptivegridrestart.hh
index addb5a801f440042487b13e6c060649113edc68a..64c1b3c978d04926b6b1b090da05097c697a8966 100644
--- a/dumux/io/adaptivegridrestart.hh
+++ b/dumux/io/adaptivegridrestart.hh
@@ -32,7 +32,6 @@
 #include <dune/grid/common/backuprestore.hh>
 
 #include <dumux/common/exceptions.hh>
-#include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 
 namespace Dumux
diff --git a/dumux/io/cakegridcreator.hh b/dumux/io/cakegridcreator.hh
index 8bbaea8b3e3573c01d44a3733f422ac99c9b359b..08b92566f64ae5057af383326d83bcfac71d1c18 100644
--- a/dumux/io/cakegridcreator.hh
+++ b/dumux/io/cakegridcreator.hh
@@ -32,7 +32,6 @@
 
 #include <dune/common/dynvector.hh>
 #include <dune/grid/common/gridfactory.hh>
-#include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 
 namespace Dumux
diff --git a/dumux/linear/seqsolverbackend.hh b/dumux/linear/seqsolverbackend.hh
index 58e6ed9855eca0514e302850f3e4942dfaecd593..a9d6c12f3692b52f81712fd0bf3df2b8349ec86a 100644
--- a/dumux/linear/seqsolverbackend.hh
+++ b/dumux/linear/seqsolverbackend.hh
@@ -32,7 +32,6 @@
 #include <dune/istl/umfpack.hh>
 
 #include <dumux/common/parameters.hh>
-#include <dumux/common/properties.hh>
 #include <dumux/common/typetraits/matrix.hh>
 #include <dumux/linear/solver.hh>
 
diff --git a/dumux/material/fluidmatrixinteractions/permeabilitykozenycarman.hh b/dumux/material/fluidmatrixinteractions/permeabilitykozenycarman.hh
index 5864e210abfb3dc312f1df878b073df11b437105..62c751c3ce19bdb797a0e4a26a90feca3dd1ca42 100644
--- a/dumux/material/fluidmatrixinteractions/permeabilitykozenycarman.hh
+++ b/dumux/material/fluidmatrixinteractions/permeabilitykozenycarman.hh
@@ -26,7 +26,6 @@
 
 #include <cmath>
 #include <dune/common/fmatrix.hh>
-#include <dumux/common/properties.hh>
 
 namespace Dumux {
 
diff --git a/dumux/nonlinear/newtonconvergencewriter.hh b/dumux/nonlinear/newtonconvergencewriter.hh
index 514121ef363aafbfc9cb0d2504d89492a23a6f25..fab1820b8dbc12e9867b303b54f794e2d7915950 100644
--- a/dumux/nonlinear/newtonconvergencewriter.hh
+++ b/dumux/nonlinear/newtonconvergencewriter.hh
@@ -27,7 +27,6 @@
 
 #include <dune/common/exceptions.hh>
 #include <dune/grid/io/file/vtk/vtksequencewriter.hh>
-#include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 
 namespace Dumux
diff --git a/dumux/porousmediumflow/2pnc/vtkoutputfields.hh b/dumux/porousmediumflow/2pnc/vtkoutputfields.hh
index 5c2150fdcdefd9bf46453a4c1e5b9be70f6e791b..e95b43ab74f971c8b29691ac93177733057d2ccb 100644
--- a/dumux/porousmediumflow/2pnc/vtkoutputfields.hh
+++ b/dumux/porousmediumflow/2pnc/vtkoutputfields.hh
@@ -24,7 +24,6 @@
 #ifndef DUMUX_TWOP_NC_VTK_OUTPUT_FIELDS_HH
 #define DUMUX_TWOP_NC_VTK_OUTPUT_FIELDS_HH
 
-#include <dumux/common/properties.hh>
 #include <dumux/porousmediumflow/2p/vtkoutputfields.hh>
 
 namespace Dumux
diff --git a/dumux/porousmediumflow/richards/primaryvariableswitch.hh b/dumux/porousmediumflow/richards/primaryvariableswitch.hh
index 5c07d13a1a428422533b5722b6d8d4f80d14c4dd..77fcb72e3fbe7b545ace670478eb36c6128ed017 100644
--- a/dumux/porousmediumflow/richards/primaryvariableswitch.hh
+++ b/dumux/porousmediumflow/richards/primaryvariableswitch.hh
@@ -26,7 +26,6 @@
 
 #include <dumux/common/exceptions.hh>
 #include <dumux/common/parameters.hh>
-#include <dumux/common/properties.hh>
 #include <dumux/material/constants.hh>
 #include <dumux/porousmediumflow/compositional/primaryvariableswitch.hh>
 
diff --git a/tutorial/ex3/spatialparams.hh b/tutorial/ex3/spatialparams.hh
index 8eb95f3d8cfda56a5abdeda7c86839cc8ac40da5..36297290e39597bf906f30495a2b6b181a128ae6 100644
--- a/tutorial/ex3/spatialparams.hh
+++ b/tutorial/ex3/spatialparams.hh
@@ -57,7 +57,7 @@ class ExerciseThreeSpatialParams
 public:
     // export permeability type
     using PermeabilityType = Dune::FieldMatrix<Scalar, dim, dim>;
-    // get material law from property system
+
     using MaterialLaw = EffToAbsLaw<RegularizedBrooksCorey<Scalar>>;
     using MaterialLawParams = typename MaterialLaw::Params;