diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
index 1895b03e47..427d5bb7fd 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
+++ b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
@@ -374,12 +374,6 @@ bool Foam::functionObjectList::readFunctionObject
     // Insert named arguments
     forAll(namedArgs, i)
     {
-        if (!funcDict.found(namedArgs[i].first()))
-        {
-            IOWarningInFunction(funcDict)
-                << "Keyword " << namedArgs[i].first() << " not found" << endl;
-        }
-
         IStringStream entryStream
         (
             namedArgs[i].first() + ' ' + namedArgs[i].second() + ';'
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/system/controlDict b/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/system/controlDict
index cb6453df14..e0ffafcd39 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/system/controlDict
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/system/controlDict
@@ -47,7 +47,7 @@ runTimeModifiable true;
 
 functions
 {
-    #includeFunc residuals
+    #includeFunc residuals(p_rgh)
     #includeFunc streamlines
 }
 
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/system/residuals b/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/system/residuals
deleted file mode 100644
index 05db31103a..0000000000
--- a/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/system/residuals
+++ /dev/null
@@ -1,19 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-Description
-    For specified fields, writes out the initial residuals for the first
-    solution of each time step; for non-scalar fields (e.g. vectors), writes
-    the largest of the residuals for each component (e.g. x, y, z).
-
-\*---------------------------------------------------------------------------*/
-
-#includeEtc "caseDicts/postProcessing/numerical/residuals.cfg"
-
-fields (p_rgh);
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/system/controlDict b/tutorials/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/system/controlDict
index 8217a916a7..f7fa95feaa 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/system/controlDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/system/controlDict
@@ -49,7 +49,9 @@ adjustTimeStep  off;
 
 functions
 {
-    #include "residuals"
+    #includeFunc residuals(region = shell, p_rgh, U, h)
+    #includeFunc residuals(region = tube, p_rgh, U, h)
+    #includeFunc residuals(region = solid, h)
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/system/residuals b/tutorials/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/system/residuals
deleted file mode 100644
index b187715810..0000000000
--- a/tutorials/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/system/residuals
+++ /dev/null
@@ -1,30 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-
-shellResiduals
-{
-    #includeEtc "caseDicts/postProcessing/numerical/residuals.cfg"
-    region shell;
-    fields (p_rgh U h);
-}
-
-tubeResiduals
-{
-    #includeEtc "caseDicts/postProcessing/numerical/residuals.cfg"
-    region tube;
-    fields (p_rgh U h);
-}
-
-solidResiduals
-{
-    #includeEtc "caseDicts/postProcessing/numerical/residuals.cfg"
-    region solid;
-    fields (h);
-}
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/system/controlDict b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/system/controlDict
index e51b11fee6..b63f0940f4 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/system/controlDict
@@ -46,7 +46,7 @@ runTimeModifiable true;
 
 functions
 {
-    #includeFunc residuals
+    #includeFunc residuals(p, sigma)
     #includeFunc singleGraph
     #includeFunc probes
 }
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/system/residuals b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/system/residuals
deleted file mode 100644
index f1972c1a86..0000000000
--- a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/system/residuals
+++ /dev/null
@@ -1,19 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-Description
-    For specified fields, writes out the initial residuals for the first
-    solution of each time step; for non-scalar fields (e.g. vectors), writes
-    the largest of the residuals for each component (e.g. x, y, z).
-
-\*---------------------------------------------------------------------------*/
-
-#includeEtc "caseDicts/postProcessing/numerical/residuals.cfg"
-
-fields (p sigma);
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/Qdot b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/Qdot
deleted file mode 100644
index 437c6b5884..0000000000
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/Qdot
+++ /dev/null
@@ -1,17 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-Description
-    Calculates the heat release rate Qdot, outputting the data as a Qdot field.
-
-\*---------------------------------------------------------------------------*/
-
-#includeEtc "caseDicts/postProcessing/combustion/Qdot.cfg"
-
-phase gas;
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/controlDict
index e3fc33cc80..2e0748cf3e 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/controlDict
@@ -29,7 +29,7 @@ deltaT          0.001;
 
 writeControl    runTime;
 
-writeInterval   1;
+writeInterval   0.001;
 
 purgeWrite      0;
 
@@ -53,7 +53,7 @@ maxDeltaT       1;
 
 functions
 {
-    #includeFunc Qdot
+    #includeFunc Qdot(phase = gas)
 }