diff --git a/examples/1ptracer/doc/main.md b/examples/1ptracer/doc/main.md
index b7e2d43ff9f93c697563adcc0cd98796ebd8fbc5..01bee1b327f37ed7691e2b060c5bf2ea1908c132 100644
--- a/examples/1ptracer/doc/main.md
+++ b/examples/1ptracer/doc/main.md
@@ -191,7 +191,7 @@ problem defined in `problem_1p.hh`. Let us now write this solution to a VTK file
 `VTKWriter`. Moreover, we add the permeability distribution to the writer.
 
 ```cpp
-    using GridView = GetPropType<OnePTypeTag, Properties::GridView>;
+    using GridView = typename GridGeometry::GridView;
     Dune::VTKWriter<GridView> onepWriter(leafGridView);
     onepWriter.addCellData(p, "p");
 
@@ -296,7 +296,7 @@ Within the time loop, we will use this assembler in each time step to assemble t
 
 ```cpp
     using TracerAssembler = FVAssembler<TracerTypeTag, DiffMethod::analytic, /*implicit=*/false>;
-    auto assembler = std::make_shared<TracerAssembler>(tracerProblem, gridGeometry, gridVariables, timeLoop);
+    auto assembler = std::make_shared<TracerAssembler>(tracerProblem, gridGeometry, gridVariables, timeLoop, xOld);
     assembler->setLinearSystem(A, r);
 ```
 
@@ -328,9 +328,6 @@ and the time step sizes used is printed to the terminal.
 ```cpp
     timeLoop->start(); do
     {
-        // First we define the old solution as the solution of the previous time step for storage evaluations.
-        assembler->setPreviousSolution(xOld);
-
         // Then the linear system is assembled.
         Dune::Timer assembleTimer;
         assembler->assembleJacobianAndResidual(x);
diff --git a/examples/1ptracer/doc/tracer.md b/examples/1ptracer/doc/tracer.md
index 7dee8dd18923f13bd50f03995816483b50d700a1..4bc60db18163160fbc0d5b598db3d659d757a65a 100644
--- a/examples/1ptracer/doc/tracer.md
+++ b/examples/1ptracer/doc/tracer.md
@@ -87,7 +87,7 @@ class TracerFluidSystem : public FluidSystems::Base<GetPropType<TypeTag, Propert
     // Some convenience aliases to be used inside this class.
     using Scalar = GetPropType<TypeTag, Properties::Scalar>;
     using Problem = GetPropType<TypeTag, Properties::Problem>;
-    using GridView = GetPropType<TypeTag, Properties::GridView>;
+    using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
     using Element = typename GridView::template Codim<0>::Entity;
     using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
     using SubControlVolume = typename FVElementGeometry::SubControlVolume;
diff --git a/examples/2pinfiltration/README.md b/examples/2pinfiltration/README.md
index 3ba9f6e4f49f2ea43fd0bf43beb18ac1a6263311..548cc6268d65cc8d98dba0bec26d911485b91d1a 100644
--- a/examples/2pinfiltration/README.md
+++ b/examples/2pinfiltration/README.md
@@ -938,7 +938,7 @@ we set the assembler with the time loop because we have an instationary problem
 
 ```cpp
     using Assembler = FVAssembler<TypeTag, DiffMethod::numeric>;
-    auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop);
+    auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
 ```
 
 we set the linear solver
diff --git a/examples/freeflowchannel/README.md b/examples/freeflowchannel/README.md
index 664c2ed5ce725a4a87ff7838816beaa7e1c504aa..6c92f3dff0be543ca80038ac1b3dd231cc2d0663 100644
--- a/examples/freeflowchannel/README.md
+++ b/examples/freeflowchannel/README.md
@@ -498,9 +498,7 @@ The second surface (second call of addSurface) is placed at the outlet of the ch
 
     const Scalar offsetX = (numCellsX % 2 == 0) ? 0.0 : 0.5*((xMax - xMin) / numCellsX);
 
-    DUNE_NO_DEPRECATED_BEGIN
-    using GridView = GetPropType<TypeTag, Properties::GridView>;
-    DUNE_NO_DEPRECATED_END
+    using GridView = typename GridGeometry::GridView;
     using Element = typename GridView::template Codim<0>::Entity;
     using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
 
diff --git a/examples/shallowwaterfriction/README.md b/examples/shallowwaterfriction/README.md
index e71e3b5460a30c7589f9125a087fcd65de40fefd..753614f12311ba15194053ab77c3c9473d6d0733 100644
--- a/examples/shallowwaterfriction/README.md
+++ b/examples/shallowwaterfriction/README.md
@@ -901,7 +901,7 @@ we set the assembler with the time loop because we have an instationary problem.
 
 ```cpp
     using Assembler = FVAssembler<TypeTag, DiffMethod::numeric>;
-    auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop);
+    auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
 ```
 
 We set the linear solver.