diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/mapFieldsDict b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/mapFieldsDict
deleted file mode 100644
index 655042b2a7..0000000000
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/mapFieldsDict
+++ /dev/null
@@ -1,22 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    format      ascii;
-    class       dictionary;
-    location    "system";
-    object      mapFieldsDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-patchMap        ( );
-
-cuttingPatches  ( );
-
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/icoFoam/cavity/cavityGrade/system/mapFieldsDict b/tutorials/incompressible/icoFoam/cavity/cavityGrade/system/mapFieldsDict
deleted file mode 100644
index 655042b2a7..0000000000
--- a/tutorials/incompressible/icoFoam/cavity/cavityGrade/system/mapFieldsDict
+++ /dev/null
@@ -1,22 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    format      ascii;
-    class       dictionary;
-    location    "system";
-    object      mapFieldsDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-patchMap        ( );
-
-cuttingPatches  ( );
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/denseParticleFoam/Goldschmidt/system/mapFieldsDict b/tutorials/lagrangian/denseParticleFoam/Goldschmidt/system/mapFieldsDict
deleted file mode 100644
index 0b2c097af4..0000000000
--- a/tutorials/lagrangian/denseParticleFoam/Goldschmidt/system/mapFieldsDict
+++ /dev/null
@@ -1,28 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    format      ascii;
-    class       dictionary;
-    object      mapFieldsDict;
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// List of pairs of source/target patches for mapping
-patchMap
-(
-);
-
-// List of target patches cutting the source domain (these need to be
-// handled specially e.g. interpolated from internal values)
-cuttingPatches
-(
-);
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/particleFoam/hopper/hopperEmptying/system/mapFieldsDict b/tutorials/lagrangian/particleFoam/hopper/hopperEmptying/system/mapFieldsDict
index 0b2c097af4..e665349839 100644
--- a/tutorials/lagrangian/particleFoam/hopper/hopperEmptying/system/mapFieldsDict
+++ b/tutorials/lagrangian/particleFoam/hopper/hopperEmptying/system/mapFieldsDict
@@ -9,20 +9,14 @@ FoamFile
 {
     format      ascii;
     class       dictionary;
+    location    "system";
     object      mapFieldsDict;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-// List of pairs of source/target patches for mapping
-patchMap
-(
-);
+patchMap        ();
+
+cuttingPatches  ();
 
-// List of target patches cutting the source domain (these need to be
-// handled specially e.g. interpolated from internal values)
-cuttingPatches
-(
-);
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0/U b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0/U.orig
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/LES/throttle3D/0/U
rename to tutorials/multiphase/cavitatingFoam/LES/throttle3D/0/U.orig
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0/alpha.vapour b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0/alpha.vapour.orig
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/LES/throttle3D/0/alpha.vapour
rename to tutorials/multiphase/cavitatingFoam/LES/throttle3D/0/alpha.vapour.orig
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0/k b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0/k.orig
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/LES/throttle3D/0/k
rename to tutorials/multiphase/cavitatingFoam/LES/throttle3D/0/k.orig
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0/nut b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0/nut.orig
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/LES/throttle3D/0/nut
rename to tutorials/multiphase/cavitatingFoam/LES/throttle3D/0/nut.orig
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0/p b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0/p.orig
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/LES/throttle3D/0/p
rename to tutorials/multiphase/cavitatingFoam/LES/throttle3D/0/p.orig
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0/rho b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0/rho.orig
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/LES/throttle3D/0/rho
rename to tutorials/multiphase/cavitatingFoam/LES/throttle3D/0/rho.orig
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allrun b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allrun
index 9ab14deb62..e6b0128b4c 100755
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allrun
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allrun
@@ -28,8 +28,10 @@ refineMeshByCellSet()
 runApplication blockMesh
 refineMeshByCellSet 1 2 3
 
-#echo "mapping fields from 2D throttle case"
-#runApplication mapFields ../throttle -sourceTime latestTime
+if [ -n "$(foamListTimes -case ../throttle)" ]
+then
+    runApplication mapFields ../throttle -sourceTime latestTime
+fi
 
 runApplication decomposePar
 runParallel $application
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/mapFieldsDict b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/mapFieldsDict
index 655042b2a7..e665349839 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/mapFieldsDict
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/mapFieldsDict
@@ -14,9 +14,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-patchMap        ( );
+patchMap        ();
 
-cuttingPatches  ( );
+cuttingPatches  ();
 
 
 // ************************************************************************* //