diff --git a/tutorials/basic/laplacianFoam/flange/Allclean b/tutorials/basic/laplacianFoam/flange/Allclean
index c9b3f9f8d41e9647d312e1aad8b34642fb4b86f3..dc38fab61fdacb0022970913862e87e614c30bb8 100755
--- a/tutorials/basic/laplacianFoam/flange/Allclean
+++ b/tutorials/basic/laplacianFoam/flange/Allclean
@@ -5,7 +5,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
-rm -rf EnSight Ensight Fieldview > /dev/null 2>&1
-rm -f constant/polyMesh/boundary > /dev/null 2>&1
+rm -rf Fieldview > /dev/null 2>&1
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/basic/potentialFoam/cylinder/Allclean b/tutorials/basic/potentialFoam/cylinder/Allclean
index 7db36b267cf5c15df49ee1d0402efdeadcef574b..61edfb303237d95429c1833e5f77dfbfd671288b 100755
--- a/tutorials/basic/potentialFoam/cylinder/Allclean
+++ b/tutorials/basic/potentialFoam/cylinder/Allclean
@@ -4,8 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-\rm -rf 0 > /dev/null 2>&1
-
 cleanCase
+rm -rf 0
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/basic/potentialFoam/pitzDaily/Allclean b/tutorials/basic/potentialFoam/pitzDaily/Allclean
index 5734444f4e74e87d3d685ad82df35bcb7e3b300e..61edfb303237d95429c1833e5f77dfbfd671288b 100755
--- a/tutorials/basic/potentialFoam/pitzDaily/Allclean
+++ b/tutorials/basic/potentialFoam/pitzDaily/Allclean
@@ -4,8 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-rm -rf 0 > /dev/null 2>&1
-
 cleanCase
+rm -rf 0
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allclean b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allclean
index bfa08cad4b3bdce3b6880daed797713330a92724..189dd60ac401acae1a0b835dabe0860cd76d32a6 100755
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allclean
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allclean
@@ -3,14 +3,10 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
 cleanCase
+rm -rf 0
 
 rm -rf VTK
-rm -rf 0
-rm -rf constant/polyMesh/sets constant/polyMesh/faces
-rm -rf constant/polyMesh/faces
-rm -rf constant/polyMesh/points
-rm -rf constant/polyMesh/owner
-rm -rf constant/polyMesh/neighbour
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/combustion/chemFoam/gri/Allclean b/tutorials/combustion/chemFoam/gri/Allclean
index a3d5bcf25f51f3320e6b8653909227871c77dee2..6d98f58208e76f0aa4e0aff3d6de550c49b0e268 100755
--- a/tutorials/combustion/chemFoam/gri/Allclean
+++ b/tutorials/combustion/chemFoam/gri/Allclean
@@ -1,12 +1,13 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-# Source tutorial run functions
+# Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
+rm -rf 0
 
-rm -rf 0 chemFoam.out constant/reactions constant/thermo \
+rm -rf chemFoam.out constant/reactions constant/thermo \
    validation/OF_vs_CHEMKINII.eps validation/chemkinII
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/combustion/chemFoam/h2/Allclean b/tutorials/combustion/chemFoam/h2/Allclean
index d511cde495b10a4ec299580f21d9f76a926cd22b..5d4bbd8d8453e850056d9668225ca6bf23b7d194 100755
--- a/tutorials/combustion/chemFoam/h2/Allclean
+++ b/tutorials/combustion/chemFoam/h2/Allclean
@@ -1,12 +1,12 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-# Source tutorial run functions
+# Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
+rm -rf 0
 
-rm -rf 0 chemFoam.out validation/OF_vs_CHEMKINII.eps validation/chemkinII
+rm -rf chemFoam.out validation/OF_vs_CHEMKINII.eps validation/chemkinII
 
 #------------------------------------------------------------------------------
-
diff --git a/tutorials/combustion/chemFoam/ic8h18/Allclean b/tutorials/combustion/chemFoam/ic8h18/Allclean
index d511cde495b10a4ec299580f21d9f76a926cd22b..5d4bbd8d8453e850056d9668225ca6bf23b7d194 100755
--- a/tutorials/combustion/chemFoam/ic8h18/Allclean
+++ b/tutorials/combustion/chemFoam/ic8h18/Allclean
@@ -1,12 +1,12 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-# Source tutorial run functions
+# Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
+rm -rf 0
 
-rm -rf 0 chemFoam.out validation/OF_vs_CHEMKINII.eps validation/chemkinII
+rm -rf chemFoam.out validation/OF_vs_CHEMKINII.eps validation/chemkinII
 
 #------------------------------------------------------------------------------
-
diff --git a/tutorials/combustion/chemFoam/ic8h18_TDAC/Allclean b/tutorials/combustion/chemFoam/ic8h18_TDAC/Allclean
index 84cf4789e86afe2a919245e96d6dbda5ad1bce97..5d4bbd8d8453e850056d9668225ca6bf23b7d194 100755
--- a/tutorials/combustion/chemFoam/ic8h18_TDAC/Allclean
+++ b/tutorials/combustion/chemFoam/ic8h18_TDAC/Allclean
@@ -1,11 +1,12 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-# Source tutorial run functions
+# Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
+rm -rf 0
 
-rm -rf 0 chemFoam.out validation/OF_vs_CHEMKINII.eps validation/chemkinII
+rm -rf chemFoam.out validation/OF_vs_CHEMKINII.eps validation/chemkinII
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/combustion/chemFoam/ic8h18_TDAC/validation/createGraph b/tutorials/combustion/chemFoam/ic8h18_TDAC/validation/createGraph
index 9019192823ea8167530d83828915c182cfb7986f..d406960eff0e42c544b00cb521d4f53bbedb5d33 100755
--- a/tutorials/combustion/chemFoam/ic8h18_TDAC/validation/createGraph
+++ b/tutorials/combustion/chemFoam/ic8h18_TDAC/validation/createGraph
@@ -21,5 +21,4 @@ gnuplot<<EOF
         "chemkinII" with lines title "Chemkin II" lt -1
 EOF
 
-# ----------------------------------------------------------------- end-of-file
-
+# -----------------------------------------------------------------------------
diff --git a/tutorials/combustion/chemFoam/nc7h16/Allclean b/tutorials/combustion/chemFoam/nc7h16/Allclean
index d511cde495b10a4ec299580f21d9f76a926cd22b..5d4bbd8d8453e850056d9668225ca6bf23b7d194 100755
--- a/tutorials/combustion/chemFoam/nc7h16/Allclean
+++ b/tutorials/combustion/chemFoam/nc7h16/Allclean
@@ -1,12 +1,12 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-# Source tutorial run functions
+# Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
+rm -rf 0
 
-rm -rf 0 chemFoam.out validation/OF_vs_CHEMKINII.eps validation/chemkinII
+rm -rf chemFoam.out validation/OF_vs_CHEMKINII.eps validation/chemkinII
 
 #------------------------------------------------------------------------------
-
diff --git a/tutorials/combustion/engineFoam/kivaTest/Allclean b/tutorials/combustion/engineFoam/kivaTest/Allclean
index 6904a7f0e6a19fcdbeeb9adb6fff02b5d3e1825b..b1fa019711a5844a72090782a6fc7ee413f96646 100755
--- a/tutorials/combustion/engineFoam/kivaTest/Allclean
+++ b/tutorials/combustion/engineFoam/kivaTest/Allclean
@@ -5,11 +5,10 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 mv ./-180 temp180
-cleanCase
 
-rm -rf 0 > /dev/null 2>&1
-rm -f constant/polyMesh/boundary > /dev/null 2>&1
+cleanCase
+rm -rf 0
 
 mv temp180 ./-180
 
-#------------------------------------------------------------------------------
\ No newline at end of file
+#------------------------------------------------------------------------------
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/Allclean b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/Allclean
index 91996c46bbe6700e19b8f16ec21ed0a0de26fa4d..a5e65c7d81ba11f5fce4451cefd5d25886c31879 100755
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/Allclean
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/Allclean
@@ -6,6 +6,5 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 cleanCase
 cleanSamples
-rm -rf constant/polyMesh/boundary
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/Allclean b/tutorials/compressible/rhoCentralFoam/shockTube/Allclean
index 0e21e4a7f618e36bac6b81fe4abdc6dbadb7fb6e..b6716d88fb7ded1749f9a99015171afd16e43228 100755
--- a/tutorials/compressible/rhoCentralFoam/shockTube/Allclean
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/Allclean
@@ -4,10 +4,8 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-# Remove 0 directory - recreated from 0.orig
-\rm -rf 0
-
 cleanCase
 cleanSamples
+rm -rf 0
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/Allclean b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/Allclean
index cc15617bf67c5c394ba94768696ab52a659c5d2b..14de6e88627c50004596ae2063b3c26b5f77355d 100755
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/Allclean
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/Allclean
@@ -4,9 +4,9 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-rm -rf 0 > /dev/null 2>&1
-rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
-
 cleanCase
+rm -rf 0
+
+rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/Allrun b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/Allrun
index 07492af16c318fe77cfd5ce17b8ea6e3741df09d..e7b28d6aa52861d4a38cd519dd01d8ef4dc69209 100755
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/Allrun
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/Allrun
@@ -9,7 +9,7 @@ runApplication surfaceFeatureExtract
 runApplication blockMesh
 runApplication snappyHexMesh -overwrite
 
-\rm -rf 0
+rm -rf 0
 
 runApplication createBaffles -overwrite
 runApplication mergeOrSplitBaffles -split -overwrite
diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/Allclean b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/Allclean
index afc06ff982c0777d9b403f7dd35f319bf094507f..92ec2e3cea000256ad300a5305b206a7669f8c29 100755
--- a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/Allclean
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/Allclean
@@ -1,5 +1,7 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
+# Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
@@ -7,3 +9,5 @@ cleanCase
 (cd system && rm -f blockMeshDict.caseBlocks blockMeshDict.caseBoundary)
 
 rm -rf resolved modelled pressure.eps
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/Allclean b/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/Allclean
index ad2d4ecb971ab4f2eaecd1f75de566f6b6fd0709..6b45f82a41b0f9a0739a80a41a680be892e55243 100755
--- a/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/Allclean
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/Allclean
@@ -6,5 +6,4 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 cleanCase
 
-
 #------------------------------------------------------------------------------
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/Allclean b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/Allclean
index 97591ced3297e7a1efcbd5bbf14a852b542c0703..7b7e1442f81b825413c545d22f7806af23753774 100755
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/Allclean
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/Allclean
@@ -4,9 +4,9 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
+cleanCase
+
 # Remove copies of common files
 \rm -rf 0 constant
 
-cleanCase
-
 #------------------------------------------------------------------------------
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/Allclean b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/Allclean
index 97591ced3297e7a1efcbd5bbf14a852b542c0703..7b7e1442f81b825413c545d22f7806af23753774 100755
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/Allclean
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/Allclean
@@ -4,9 +4,9 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
+cleanCase
+
 # Remove copies of common files
 \rm -rf 0 constant
 
-cleanCase
-
 #------------------------------------------------------------------------------
diff --git a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/Allclean b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/Allclean
index d1c82b1a7c0a0599929fc6f535edbaabcd4f6ec9..1deb20913349eeacef2f946da013700e1da32287 100755
--- a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/Allclean
+++ b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/Allclean
@@ -5,7 +5,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
-rm -f constant/polyMesh/boundary   > /dev/null 2>&1
 
 # Don't need these extra files (from star4ToFoam conversion)
 rm -f \
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/Allclean b/tutorials/compressible/sonicFoam/laminar/shockTube/Allclean
index ea06ee44e4a644b27faa316683704cbd2f1ac709..b6716d88fb7ded1749f9a99015171afd16e43228 100755
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/Allclean
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/Allclean
@@ -4,10 +4,8 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-# Remove 0.orig/ copy
-\rm -rf 0
-
 cleanCase
 cleanSamples
+rm -rf 0
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/Allclean b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/Allclean
index 9852503f2cbb2cde23704919366eba86795aa532..194c42b8c6233e8ac32fe9af0a404b0e4c87fec8 100755
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/Allclean
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/Allclean
@@ -4,11 +4,11 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
+cleanCase
+
 rm -rf 0/lagrangian 0/uniform
 rm -f Ar-Ar
 rm -f electrostatic
 rm -f constant/idList
-rm -rf constant/polyMesh/sets
-cleanCase
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/Allclean b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/Allclean
index ec56cfe28b5c5e42f3612988c3f892f2e13a9b82..d52fe88c714670d852505bca2f7a2809c2ebdf6c 100755
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/Allclean
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/Allclean
@@ -4,11 +4,11 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
+cleanCase
+
 rm -rf 0/lagrangian 0/uniform
 rm -f O-O
 rm -f electrostatic
 rm -f constant/idList
-rm -rf constant/polyMesh/sets
-cleanCase
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allclean b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allclean
index 21cb83d5ac45c55ab65be79e1f03aa7fab9824f0..7fa5428f73ef770d9a80f24404f72379d39aa6c9 100755
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allclean
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allclean
@@ -4,8 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-rm -rf constant/polyMesh/sets
-rm -rf processor[0-9]
 cleanCase
+rm -rf processor[0-9]
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allclean b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allclean
index bb7f5888ae2703ca93602dd921d5a177cf4c32eb..f02ac1a6eb25f412b2cdecb8ec210e1c3aac5244 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allclean
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allclean
@@ -1,7 +1,7 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-# Source tutorial run functions
+# Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/Allclean b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/Allclean
index eabb05d8f40e073e52e0c2fb100624a2d98e4e92..eb1e8dba18a620da99b58b90ac1c5165577bd46e 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/Allclean
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/Allclean
@@ -5,8 +5,8 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
-rm -rf constant/baffle3DRegion
-rm -rf constant/polyMesh/boundary
 rm -rf 0
 
+rm -rf constant/baffle3DRegion
+
 #------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/Allclean b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/Allclean
index 82e538bb437c74bcb9fb9647866fc714de04586c..757a0f3d6cc04adbbee8dcd12dd23f5ca70a7742 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/Allclean
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/Allclean
@@ -5,19 +5,22 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
+
 rm -rf comms
 rm -rf VTK
-rm -rf constant/cellToRegion constant/polyMesh/sets
+rm -rf constant/cellToRegion
+
 rm -rf 0/bottomWater
 rm -rf 0/topAir
 rm -rf 0/heater
 rm -rf 0/leftSolid
 rm -rf 0/rightSolid
 rm -f 0/cellToRegion
+
 rm -rf constant/bottomWater/polyMesh
 rm -rf constant/topAir/polyMesh
 rm -rf constant/heater/polyMesh
 rm -rf constant/leftSolid/polyMesh
 rm -rf constant/rightSolid/polyMesh
 
-# ----------------------------------------------------------------- end-of-file
+# -----------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/Allrun
index e6c35cda767da0c3fd7b35530d89ba2d74577a11..0a12ee44a701b63e194242ed7667e3511a795362 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/Allrun
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/Allrun
@@ -1,7 +1,6 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
@@ -30,5 +29,4 @@ runApplication ./externalSolver
 # Reconstruct
 runApplication reconstructPar -allRegions
 
-
-# ----------------------------------------------------------------- end-of-file
+# -----------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/Allrun.pre b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/Allrun.pre
index f6fd2f3950db44838f3601922e8570b950c667fa..481deedc7be6350d0f3f0467f200860a7b8efbd4 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/Allrun.pre
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/Allrun.pre
@@ -1,7 +1,6 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
@@ -30,4 +29,4 @@ echo "creating files for paraview post-processing"
 echo
 paraFoam -touchAll 2>/dev/null
 
-# ----------------------------------------------------------------- end-of-file
+# -----------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allclean b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allclean
index c90b8ceb13510e20c3817949ed55f7433c8a2ced..4d24110e3a5d3caa4d8e587c78dd139ed60a6ab8 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allclean
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allclean
@@ -7,7 +7,7 @@ cd ${0%/*} || exit 1    # run from this directory
 cleanCase
 
 rm -rf VTK
-rm -rf constant/cellToRegion constant/polyMesh/sets
+rm -rf constant/cellToRegion
 
 rm -rf constant/air/polyMesh
 rm -rf constant/solid/polyMesh
@@ -28,6 +28,4 @@ rm -f 0/floor/cellToRegion
 rm -f 0/solid/cellToRegion
 rm -f 0/cellToRegion
 
-
-
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allrun
index 225acd829ffc3db0773edc3ec194daf2b88a455c..4ab71d56f148d597f91a0ca4b78d32872b2ea5ff 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allrun
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allrun
@@ -1,11 +1,9 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
 
-
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-
 # Setup case
 ./Allrun.pre
 
@@ -31,4 +29,4 @@ echo "creating files for paraview post-processing"
 echo
 paraFoam -touchAll
 
-# ----------------------------------------------------------------- end-of-file
+# -----------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allrun.pre b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allrun.pre
index 59a0bb8730be7667c71d48164fdeda7da63751fc..9ab5e3c25a3f2c02ac509bcaa7bd04fc7bae64fb 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allrun.pre
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allrun.pre
@@ -1,7 +1,6 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
 
-
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
@@ -25,5 +24,4 @@ do
     changeDictionary -region $i > log.changeDictionary.$i 2>&1
 done
 
-
-# ----------------------------------------------------------------- end-of-file
+# -----------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allclean b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allclean
index d615a28f98fdfa1e288e3f5cb22e17741d1b58d7..8b0c932d51bf1e3d5fa3801e7a13c54bc84021c4 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allclean
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allclean
@@ -5,14 +5,16 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
+
 rm -rf VTK
-rm -rf constant/cellToRegion constant/polyMesh/sets
+rm -rf constant/cellToRegion
 rm -f 0/cellToRegion
 rm -rf 0/bottomWater
 rm -rf 0/topAir
 rm -rf 0/heater
 rm -rf 0/leftSolid
 rm -rf 0/rightSolid
+
 rm -rf constant/bottomWater/polyMesh
 rm -rf constant/topAir/polyMesh
 rm -rf constant/heater/polyMesh
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allclean b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allclean
index f56be82da793799b52135652c4864db7914b1014..230730502d4354ca3a067e8ea9101b44c17c6055 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allclean
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allclean
@@ -4,19 +4,20 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
+cleanCase
+
 rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
 rm -f constant/triSurface/*.eMesh > /dev/null 2>&1
-rm -f constant/polyMesh/boundary
 
-cleanCase
 rm -rf VTK
-rm -rf constant/cellToRegion constant/polyMesh/sets
+rm -rf constant/cellToRegion
 rm -rf 0/bottomAir
 rm -rf 0/topAir
 rm -rf 0/heater
 rm -rf 0/leftSolid
 rm -rf 0/rightSolid
 rm -f 0/cellToRegion
+
 rm -rf constant/bottomAir/polyMesh
 rm -rf constant/topAir/polyMesh
 rm -rf constant/heater/polyMesh
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/Allclean b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/Allclean
index 734eec89e40643a4e68fdc0029f15d37f06c5a95..c34834dedb650920f607102c964349c37c94b715 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/Allclean
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/Allclean
@@ -1,11 +1,13 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-# Source tutorial run functions
+# Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
-
 rm -rf 0
+
 rm -rf constant/windshield/polyMesh
 rm -rf constant/cabin/polyMesh
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/Allclean b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/Allclean
index b484aeff5263bac9cafa5b0e94af1ee3f5723095..92a631d049e9eecb43b4963fd484a99e6949479a 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/Allclean
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/Allclean
@@ -1,13 +1,14 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-# Source tutorial run functions
+# Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
-
 rm -rf 0
 
 rm -rf constant/exterior/polyMesh
 rm -rf constant/ice/polyMesh
 rm -rf constant/cabin/polyMesh
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allclean b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allclean
index 0cfcbc5894d9c88c090301d2d28d6a4b63ca9efc..5a54eef9a0e647fa7b80e85aca2642079808588c 100755
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allclean
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allclean
@@ -1,15 +1,15 @@
 #!/bin/sh
-
 cd ${0%/*} || exit 1    # Run from this directory
 
-# Source tutorial run functions
+# Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
+rm -rf 0
 
 foamCleanPolyMesh -region air
 foamCleanPolyMesh -region porous
 
 rm -f *.OpenFOAM
 
-rm -rf 0
+#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allclean b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allclean
index e440375b6a98867ab69afbcf83ec2101e32b09f8..0df7ec62070aabead25912cd37ee92ce69a840d5 100755
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allclean
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allclean
@@ -6,7 +6,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 cleanCase
 rm -rf VTK
-rm -rf constant/cellToRegion constant/polyMesh/sets
+rm -rf constant/cellToRegion
 rm -rf 0/bottomAir
 rm -rf 0/topAir
 rm -rf 0/heater
@@ -28,7 +28,6 @@ rm -f constant/bottomAir/subMap
 rm -f constant/bottomAir/visibleFaceFaces
 rm -f constant/bottomAir/mapDist
 
-
 rm -f constant/topAir/F
 rm -f constant/topAir/constructMap*
 rm -f constant/topAir/finalAgglom
diff --git a/tutorials/incompressible/icoFoam/cavityMappingTest/Allclean b/tutorials/incompressible/icoFoam/cavityMappingTest/Allclean
index 0280fc46544361e40d3891c2fcf9afbf231c2fcb..b5eb7e0aafa40af43d0cc09ad4fb1b7800b3b8cd 100755
--- a/tutorials/incompressible/icoFoam/cavityMappingTest/Allclean
+++ b/tutorials/incompressible/icoFoam/cavityMappingTest/Allclean
@@ -1,11 +1,10 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
 
-# Source tutorial run functions
+# Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
-
 rm -rf constant/coarseMesh
 
-
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/icoFoam/elbow/Allclean b/tutorials/incompressible/icoFoam/elbow/Allclean
index f2da619e3dc41408d96034326836d3a3784aea8e..400ad856874908800dc2bc9f19a39b55c9637ad9 100755
--- a/tutorials/incompressible/icoFoam/elbow/Allclean
+++ b/tutorials/incompressible/icoFoam/elbow/Allclean
@@ -4,8 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-rm -f constant/polyMesh/boundary > /dev/null 2>&1
-rm -rf fluentInterface
 cleanCase
+rm -rf fluentInterface
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/Allclean b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/Allclean
index 4496e60747ea13a6e58942e786fd45d6465ea705..61edfb303237d95429c1833e5f77dfbfd671288b 100755
--- a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/Allclean
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/Allclean
@@ -5,5 +5,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
-
 rm -rf 0
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/Allclean b/tutorials/incompressible/pimpleDyMFoam/propeller/Allclean
index 496837c14e38ea0b4554af1025abfc9c3a42f380..2334d531d334618050cbef53f358707fab5745ed 100755
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/Allclean
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/Allclean
@@ -4,11 +4,12 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-# remove surface
-rm -f constant/triSurface/propellerTip.obj.gz > /dev/null 2>&1
-
 cleanCase
+rm -rf 0
+
+# Remove surfaces and features
+rm -f constant/triSurface/propellerTip.obj.gz > /dev/null 2>&1
+rm -f constant/triSurface/*.eMesh*            > /dev/null 2>&1
+rm -rf constant/extendedFeatureEdgeMesh       > /dev/null 2>&1
 
-rm -rf 0 > /dev/null 2>&1
-rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
-rm -f constant/triSurface/*.eMesh* > /dev/null 2>&1
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun.pre b/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun.pre
index 6bb6affbfdcd631db1d908b2da685312c297b07d..fd9adacb88dc892576ce57e5d8dd1ebf2b127e35 100755
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun.pre
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun.pre
@@ -29,3 +29,5 @@ runApplication createPatch -overwrite
 
 # - set the initial fields
 restore0Dir
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allclean b/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allclean
index d01b222a10e303146c99367a82f47526ffaed6e7..ae51d1251b29abd147072ac8ee9dae5c067c81d1 100755
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allclean
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allclean
@@ -1,7 +1,7 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-# Source tutorial run functions
+# Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 (
@@ -20,3 +20,5 @@ cd ${0%/*} || exit 1    # Run from this directory
     cleanCase
     rm -rf 0
 )
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pimpleFoam/channel395DFSEM/Allrun b/tutorials/incompressible/pimpleFoam/channel395DFSEM/Allrun
index 2ba4fbfe4201bfc156f4cf3b9891e6edf69d4953..f9a700b1f01599076eca26ea02bb61c561a732ab 100755
--- a/tutorials/incompressible/pimpleFoam/channel395DFSEM/Allrun
+++ b/tutorials/incompressible/pimpleFoam/channel395DFSEM/Allrun
@@ -17,4 +17,4 @@ runApplication decomposePar -cellDist
 runParallel $application
 #runApplication reconstructPar -latestTime
 
-# ----------------------------------------------------------------- end-of-file
+# -----------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/Allclean b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/Allclean
index 0f2f7ba75f3eef784515c8f4fc1c3d4650637320..78739484071adc3d0fd4dff44d0810a0582f66d5 100755
--- a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/Allclean
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/Allclean
@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
-rm -rf postProcessing *.dat validation/*.eps
+rm -rf *.dat validation/*.eps
 
 wclean validation/WatersKing
 
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/Allclean b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/Allclean
index 32ab17201f0a9095b374dd06a9a707512756fd24..da3e92633310925af6fdd2401853242b6304627b 100755
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/Allclean
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/Allclean
@@ -4,12 +4,11 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-# remove surface
-rm -f constant/triSurface/motorBike.obj.gz
-
-rm -rf 0 > /dev/null 2>&1
-
 cleanCase
+rm -rf 0
+
+# Remove surface
+rm -f constant/triSurface/motorBike.obj.gz
 
 # Reset decomposeParDict
 cp system/decomposeParDict.hierarchical system/decomposeParDict
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/Allclean b/tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/Allclean
index 97591ced3297e7a1efcbd5bbf14a852b542c0703..7b7e1442f81b825413c545d22f7806af23753774 100755
--- a/tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/Allclean
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/Allclean
@@ -4,9 +4,9 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
+cleanCase
+
 # Remove copies of common files
 \rm -rf 0 constant
 
-cleanCase
-
 #------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/Allclean b/tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/Allclean
index 97591ced3297e7a1efcbd5bbf14a852b542c0703..7b7e1442f81b825413c545d22f7806af23753774 100755
--- a/tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/Allclean
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/Allclean
@@ -4,9 +4,9 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
+cleanCase
+
 # Remove copies of common files
 \rm -rf 0 constant
 
-cleanCase
-
 #------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allclean b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allclean
index f7e384215e413bf60b4cf501fcc080f648c3cd9f..4ebf8a1a7ff18db41add5c4532e3005eb2f935fa 100755
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allclean
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allclean
@@ -4,11 +4,10 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
+cleanCase
+
 rm *.obj > /dev/null 2>&1
 rm -r constant/extendedFeatureEdgeMesh > /dev/null 2>&1
 rm constant/triSurface/boundaryAndFaceZones.eMesh > /dev/null 2>&1
-rm constant/polyMesh/boundary > /dev/null 2>&1
-
-cleanCase
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/simpleFoam/T3A/Allclean b/tutorials/incompressible/simpleFoam/T3A/Allclean
index bb7f5888ae2703ca93602dd921d5a177cf4c32eb..f02ac1a6eb25f412b2cdecb8ec210e1c3aac5244 100755
--- a/tutorials/incompressible/simpleFoam/T3A/Allclean
+++ b/tutorials/incompressible/simpleFoam/T3A/Allclean
@@ -1,7 +1,7 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-# Source tutorial run functions
+# Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
diff --git a/tutorials/incompressible/simpleFoam/motorBike/Allclean b/tutorials/incompressible/simpleFoam/motorBike/Allclean
index 68a1d17d7b95d4325ac62967c787eb8a3e01709c..959198cb951ec2650be6768587cfd28a789812ee 100755
--- a/tutorials/incompressible/simpleFoam/motorBike/Allclean
+++ b/tutorials/incompressible/simpleFoam/motorBike/Allclean
@@ -1,13 +1,15 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-# remove surface and features
-rm -f constant/triSurface/motorBike.obj.gz > /dev/null 2>&1
-rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
-rm -f constant/triSurface/motorBike.eMesh > /dev/null 2>&1
+cleanCase
+rm -rf 0
 
-rm -rf 0 > /dev/null 2>&1
+# Remove surface and features
+rm -f constant/triSurface/motorBike.obj.gz > /dev/null 2>&1
+rm -f constant/triSurface/motorBike.eMesh  > /dev/null 2>&1
+rm -rf constant/extendedFeatureEdgeMesh    > /dev/null 2>&1
 
-cleanCase
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/Allclean b/tutorials/incompressible/simpleFoam/pipeCyclic/Allclean
index 5734444f4e74e87d3d685ad82df35bcb7e3b300e..61edfb303237d95429c1833e5f77dfbfd671288b 100755
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/Allclean
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/Allclean
@@ -4,8 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-rm -rf 0 > /dev/null 2>&1
-
 cleanCase
+rm -rf 0
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/Allclean b/tutorials/incompressible/simpleFoam/rotorDisk/Allclean
index 2204732e4514bf77bc9ed355ca0406b7fe14f919..f68257aae3e970264f934ea831f92ace5ae41e31 100755
--- a/tutorials/incompressible/simpleFoam/rotorDisk/Allclean
+++ b/tutorials/incompressible/simpleFoam/rotorDisk/Allclean
@@ -1,13 +1,16 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-# remove surface and features
+cleanCase
+
+# Remove surface and features
 rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
 rm -f constant/triSurface/rotatingZone.eMesh > /dev/null 2>&1
 rm -f constant/triSurface/fixed.eMesh > /dev/null 2>&1
 rm -f 0/pointLevel > /dev/null 2>&1
 rm -f 0/cellLevel > /dev/null 2>&1
 
-cleanCase
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/Allclean b/tutorials/incompressible/simpleFoam/turbineSiting/Allclean
index aae8b75f8001d1185e98aed5bdf34ec320ab0918..abf6e2e700e3eafc368ea14db56dc9fb7f3c6118 100755
--- a/tutorials/incompressible/simpleFoam/turbineSiting/Allclean
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/Allclean
@@ -4,9 +4,8 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-rm -rf 0 > /dev/null 2>&1
-
 cleanCase
+rm -rf 0
 
 # Remove decomposeParDict
 rm -f system/decomposeParDict
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/Allclean b/tutorials/incompressible/simpleFoam/windAroundBuildings/Allclean
index baa135b1d4b849a9052e86c1900402eeb91e66bb..03ba09eaba07646ab62f93ddace2f6231efc7c96 100755
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/Allclean
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/Allclean
@@ -8,6 +8,5 @@ cleanCase
 
 rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
 rm -f constant/triSurface/buildings.eMesh > /dev/null 2>&1
-rm -f constant/polyMesh/boundary > /dev/null 2>&1
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/Allclean b/tutorials/lagrangian/MPPICFoam/cyclone/Allclean
index 2f40581670efd0cc2f3df08a386ca1392c571fda..e7a7ea76ade6f295e14360c547b0372f3df4dd88 100755
--- a/tutorials/lagrangian/MPPICFoam/cyclone/Allclean
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/Allclean
@@ -1,7 +1,11 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
+# Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
+cleanCase
+
 # rm -f constant/triSurface/cyclone.stl.gz > /dev/null 2>&1
 
-cleanCase
+#------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allclean b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allclean
index 85527724bf1755a5b4ddb251062932f53faba38f..47cedce61ea4664897f6d1a65785260159fcd9a4 100755
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allclean
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allclean
@@ -1,7 +1,7 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-# Source tutorial run functions
+# Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 (
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/Allclean b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/Allclean
index 77256434358799e3d17b6b07fc28b59cb7932e6c..4d36bb740b17841a65611ab534a65a124b816623 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/Allclean
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/Allclean
@@ -5,9 +5,9 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
+rm -rf 0
 
 rm -rf constant/wallFilmRegion
-rm -rf 0
 rm -f *.obj
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allclean b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allclean
index db95457745278b3ebe1e811db469c43638b94cf8..6ed9b627a7676e3830a2ad8f16a062df52439156 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allclean
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allclean
@@ -5,10 +5,10 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
+rm -rf 0
 
 rm -rf system/wallFilmRegion
 rm -rf constant/wallFilmRegion
-rm -rf 0
 rm -f *.obj
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/Allclean b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/Allclean
index 77256434358799e3d17b6b07fc28b59cb7932e6c..4d36bb740b17841a65611ab534a65a124b816623 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/Allclean
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/Allclean
@@ -5,9 +5,9 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
+rm -rf 0
 
 rm -rf constant/wallFilmRegion
-rm -rf 0
 rm -f *.obj
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/Allclean b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/Allclean
index 77256434358799e3d17b6b07fc28b59cb7932e6c..4d36bb740b17841a65611ab534a65a124b816623 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/Allclean
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/Allclean
@@ -5,9 +5,9 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
+rm -rf 0
 
 rm -rf constant/wallFilmRegion
-rm -rf 0
 rm -f *.obj
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/Allclean b/tutorials/lagrangian/reactingParcelFoam/filter/Allclean
index 7e7333f78c35c9d0bdc6794e91a776d808b25757..61edfb303237d95429c1833e5f77dfbfd671288b 100755
--- a/tutorials/lagrangian/reactingParcelFoam/filter/Allclean
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/Allclean
@@ -4,9 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-# Remove 0.orig/ copy and post-processing directories
-\rm -rf 0 postProcessing
-
 cleanCase
+rm -rf 0
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allclean b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allclean
index df77730bc36a67aea467817e807431c476e580ef..61edfb303237d95429c1833e5f77dfbfd671288b 100755
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allclean
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allclean
@@ -4,9 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-# remove old time and post-processing directories
-rm -rf 0 *[1-9]* processor* postProcessing
-
 cleanCase
+rm -rf 0
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/Allclean b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/Allclean
index 08f70e11b9b6b6c5e9a989f1389eb10e914084a9..61edfb303237d95429c1833e5f77dfbfd671288b 100755
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/Allclean
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/Allclean
@@ -4,11 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-# remove old time and post-processing directories
-rm -rf 0 *[1-9]* processor* postProcessing
-
-# copy 0.orig to 0
-cp -r 0.orig 0
 cleanCase
+rm -rf 0
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allclean b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allclean
index 6a56bbcf58be1755525b7444b805ad077dc46ed2..61edfb303237d95429c1833e5f77dfbfd671288b 100755
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allclean
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allclean
@@ -4,9 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-# Remove old time, 0.orig/ copy and post-processing directories
-\rm -rf 0 *[1-9]* processor* postProcessing
-
 cleanCase
+rm -rf 0
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allrun b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allrun
index a4698df1e26e7f0f62dc322d80187bd491337d14..6be8a2051632b8004293b797d6d23148bae5e06b 100755
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allrun
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allrun
@@ -10,7 +10,7 @@ runApplication blockMesh
 
 runApplication potentialFoam
 
-# remove incompatible (volumetric) flux field
+# Remove incompatible (volumetric) flux field
 \rm -f 0/phi 2>/dev/null
 
 runApplication $(getApplication)
diff --git a/tutorials/mesh/foamyHexMesh/blob/Allclean b/tutorials/mesh/foamyHexMesh/blob/Allclean
index 7563c7a99b428cfaf27303919459881e34fe37ec..f4dcb53f51ae231ae70396df6af873ab45157851 100755
--- a/tutorials/mesh/foamyHexMesh/blob/Allclean
+++ b/tutorials/mesh/foamyHexMesh/blob/Allclean
@@ -1,12 +1,11 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-# Source tutorial run functions
+# Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
-
-rm -rf 0 > /dev/null 2>&1
+rm -rf 0
 
 rm -rf constant/triSurface/blob.stl.gz > /dev/null 2>&1
 
@@ -23,5 +22,4 @@ rm -rf constant/backgroundMeshDecomposition/polyMesh/points > /dev/null 2>&1
 rm -rf snapToSurface?.obj > /dev/null 2>&1
 rm -rf tetsToSnapTo.obj > /dev/null 2>&1
 
-
 #------------------------------------------------------------------------------
diff --git a/tutorials/mesh/foamyHexMesh/flange/Allclean b/tutorials/mesh/foamyHexMesh/flange/Allclean
index 2ceecfe1f9a862f15e8234fea4c5e3727262db6b..75abafd12bbd62c1b60132289e14316722425a5e 100755
--- a/tutorials/mesh/foamyHexMesh/flange/Allclean
+++ b/tutorials/mesh/foamyHexMesh/flange/Allclean
@@ -1,15 +1,17 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-# Source tutorial run functions
+# Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
+cleanCase
+rm -rf 0
+
 rm -r constant/triSurface/flange.stl.gz > /dev/null 2>&1
 
 rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
 rm -r constant/ccx constant/ccy constant/ccz > /dev/null 2>&1
 rm -r constant/internalDelaunayVertices constant/targetCellSize > /dev/null 2>&1
-rm -r 0 > /dev/null 2>&1
 
 rm -rf constant/backgroundMeshDecomposition/polyMesh/boundary > /dev/null 2>&1
 rm -rf constant/backgroundMeshDecomposition/polyMesh/faces > /dev/null 2>&1
@@ -19,6 +21,4 @@ rm -rf constant/backgroundMeshDecomposition/polyMesh/points > /dev/null 2>&1
 
 rm -r *.obj > /dev/null 2>&1
 
-cleanCase
-
 #------------------------------------------------------------------------------
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/Allclean b/tutorials/mesh/foamyHexMesh/mixerVessel/Allclean
index d7ffd378fae96d830b553992b41d88dc157f5bfd..afee03547e34f0855ee2be1fe2dfe4d12c52a816 100755
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/Allclean
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/Allclean
@@ -5,8 +5,8 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
-
 rm -rf 0
+
 rm -rf constant/extendedFeatureEdgeMesh/
 rm -f constant/triSurface/*.eMesh*
 rm -f constant/triSurface/*.stl
diff --git a/tutorials/mesh/foamyHexMesh/simpleShapes/Allclean b/tutorials/mesh/foamyHexMesh/simpleShapes/Allclean
index 66229e46ca5fe8a4f79754ab7ceca7fe88bd9e11..5ef122ebb30cc640437da46d5fee4c0e6d83489e 100755
--- a/tutorials/mesh/foamyHexMesh/simpleShapes/Allclean
+++ b/tutorials/mesh/foamyHexMesh/simpleShapes/Allclean
@@ -1,22 +1,19 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-# Source tutorial run functions
+# Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
+cleanCase
+rm -rf 0
+
 rm -r constant/extendedFeatureEdgeMesh constant/internalDelaunayVertices > /dev/null 2>&1
-rm constant/triSurface/*.eMesh > /dev/null 2>&1
-rm constant/triSurface/*_orient* > /dev/null 2>&1
-rm -r constant/polyMesh > /dev/null 2>&1
-rm -r constant/polyMesh > /dev/null 2>&1
+rm -f constant/triSurface/*.eMesh > /dev/null 2>&1
+rm -f constant/triSurface/*_orient* > /dev/null 2>&1
 rm -r constant/tetDualMesh > /dev/null 2>&1
 
 rm -r snapToSurface?.obj tetsToSnapTo.obj > /dev/null 2>&1
 
 rm domain coneAndSphere > /dev/null 2>&1
 
-rm -rf 0/
-
-cleanCase
-
 #------------------------------------------------------------------------------
diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/Allclean b/tutorials/mesh/foamyQuadMesh/OpenCFD/Allclean
index ab8099c64971dbd3141d6156a18bedd38f08b925..894a75c4e03255191b0498997bda71b39cd4df3d 100755
--- a/tutorials/mesh/foamyQuadMesh/OpenCFD/Allclean
+++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/Allclean
@@ -1,15 +1,14 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-# Source tutorial run functions
+# Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
+cleanCase
+rm -rf 0
+
 rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
 rm -rf constant/triSurface/*.eMesh > /dev/null 2>&1
-rm -rf 0 > /dev/null 2>&1
 rm -rf MeshedSurface.obj > /dev/null 2>&1
 
-cleanCase
-
-
 #------------------------------------------------------------------------------
diff --git a/tutorials/mesh/foamyQuadMesh/jaggedBoundary/Allclean b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/Allclean
index 3a0c2229939d24c1c4e2f55609fd85dd6651260e..1048413963ce7226c94aab7512a8aab6485a010a 100755
--- a/tutorials/mesh/foamyQuadMesh/jaggedBoundary/Allclean
+++ b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/Allclean
@@ -1,16 +1,13 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-# Source tutorial run functions
+# Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
+cleanCase
+
 rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
 rm -rf constant/triSurface/jaggedBoundary.eMesh > /dev/null 2>&1
-rm -rf constant/polyMesh > /dev/null 2>&1
-
 rm -rf MeshedSurface.obj > /dev/null 2>&1
 
-cleanCase
-
-
 #------------------------------------------------------------------------------
diff --git a/tutorials/mesh/foamyQuadMesh/square/Allclean b/tutorials/mesh/foamyQuadMesh/square/Allclean
index d8936babb013ad9f884be606f76121024066f516..8da713f31dc2496b7deb2fa033108085ce7e5ac0 100755
--- a/tutorials/mesh/foamyQuadMesh/square/Allclean
+++ b/tutorials/mesh/foamyQuadMesh/square/Allclean
@@ -1,16 +1,13 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-# Source tutorial run functions
+# Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
+cleanCase
+
 rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
 rm -rf constant/triSurface/unit_cube.eMesh > /dev/null 2>&1
-rm -rf constant/polyMesh > /dev/null 2>&1
-
 rm -rf MeshedSurface*.obj > /dev/null 2>&1
 
-cleanCase
-
-
 #------------------------------------------------------------------------------
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/Allclean b/tutorials/mesh/refineMesh/refineFieldDirs/Allclean
index 5734444f4e74e87d3d685ad82df35bcb7e3b300e..61edfb303237d95429c1833e5f77dfbfd671288b 100755
--- a/tutorials/mesh/refineMesh/refineFieldDirs/Allclean
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/Allclean
@@ -4,8 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-rm -rf 0 > /dev/null 2>&1
-
 cleanCase
+rm -rf 0
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/mesh/snappyHexMesh/flange/Allclean b/tutorials/mesh/snappyHexMesh/flange/Allclean
index eba9b7e6d2ace77c244df92f811f7a6314098021..e46b494f7bf07f293ef3fe89824b808255d17441 100755
--- a/tutorials/mesh/snappyHexMesh/flange/Allclean
+++ b/tutorials/mesh/snappyHexMesh/flange/Allclean
@@ -4,15 +4,14 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-# remove surface
-rm -f constant/triSurface/flange.stl.gz
+cleanCase
+rm -rf 0
 
-rm -rf 0 > /dev/null 2>&1
 rm -f ./flange ./*.obj > /dev/null 2>&1
-rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
-rm -f constant/triSurface/flange.eMesh > /dev/null 2>&1
-rm -f constant/polyMesh/boundary
 
-cleanCase
+# Remove surface and features
+rm -f constant/triSurface/flange.stl.gz > /dev/null 2>&1
+rm -f constant/triSurface/flange.eMesh  > /dev/null 2>&1
+rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/Allclean b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/Allclean
index 9cbb0c1a827e7b2818c31d1b389e118c11e55922..eb6c79aa66377452012b3c76c7b3701ede496beb 100755
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/Allclean
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/Allclean
@@ -9,4 +9,4 @@ cleanCase
 rm -f system/blockMeshDict
 rm -f 0/alpha.water
 
-# ----------------------------------------------------------------- end-of-file
+# -----------------------------------------------------------------------------
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/Allrun b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/Allrun
index b5139052585786476764b1b342c5f887339d82f8..18e8f4ad3a61571248cf859a3fb04e03b8431ed9 100755
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/Allrun
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/Allrun
@@ -4,7 +4,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-
 # Set application name
 application=$(getApplication)
 
@@ -33,4 +32,4 @@ runParallel $(getApplication)
 # Reconstruct case
 runApplication reconstructPar
 
-# ----------------------------------------------------------------- end-of-file
+# -----------------------------------------------------------------------------
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/Allclean b/tutorials/multiphase/cavitatingFoam/LES/throttle/Allclean
index 57c93208bcd205e53f0528094047832e8ecc2926..6bb45f9da9b680c3e27b84f32480c955af2cdc87 100755
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle/Allclean
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/Allclean
@@ -4,9 +4,9 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-rm -rf constant/polyMesh/sets > /dev/null 2>&1
+cleanCase
+
 rm -rf 0/polyMesh > /dev/null 2>&1
 rm system/topoSetDict > /dev/null 2>&1
-cleanCase
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allclean b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allclean
index d1fd91d5d36810bf19137be1017ecb7f7bcba27e..8b8b96fa046507b00e2e1498724d4a5095eb9620 100755
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allclean
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allclean
@@ -4,10 +4,10 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-rm -rf constant/polyMesh/sets > /dev/null 2>&1
-rm -rf 0 > /dev/null 2>&1
+cleanCase
+rm -rf 0
+
 rm system/topoSetDict > /dev/null 2>&1
 rm -rf processor[0-9] > /dev/null 2>&1
-cleanCase
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/Allclean b/tutorials/multiphase/cavitatingFoam/RAS/throttle/Allclean
index 57c93208bcd205e53f0528094047832e8ecc2926..6bb45f9da9b680c3e27b84f32480c955af2cdc87 100755
--- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/Allclean
+++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/Allclean
@@ -4,9 +4,9 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-rm -rf constant/polyMesh/sets > /dev/null 2>&1
+cleanCase
+
 rm -rf 0/polyMesh > /dev/null 2>&1
 rm system/topoSetDict > /dev/null 2>&1
-cleanCase
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allclean b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allclean
index 9f691c93851e250425529116772e1d82b81075f2..61edfb303237d95429c1833e5f77dfbfd671288b 100755
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allclean
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allclean
@@ -5,7 +5,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
-
 rm -rf 0
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allclean b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allclean
index a180eaa28b0e134a40df326d3698eecf2b8a0083..86d9367383102e275fe026983693dbb638b74aa4 100755
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allclean
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allclean
@@ -5,7 +5,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
-
 rm -rf 0
 rm -rf processor*
 
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allclean b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allclean
index 9f691c93851e250425529116772e1d82b81075f2..61edfb303237d95429c1833e5f77dfbfd671288b 100755
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allclean
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allclean
@@ -5,7 +5,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
-
 rm -rf 0
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/Allclean b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/Allclean
index c89fe3143ec469261888941ae84708ce1b245469..5558bc15964454d9da8be140c14cb8803f2aa115 100755
--- a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/Allclean
+++ b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/Allclean
@@ -2,7 +2,6 @@
 cd ${0%/*} || exit 1    # Run from this directory
 
 # Clean time directories only
-
 rm -rf *[1-9]*
 rm -f log.* 2>/dev/null
 
diff --git a/tutorials/multiphase/interDyMFoam/RAS/DTCHull/Allclean b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/Allclean
index e3e304dace9b32b33ff744ce134c16fe06fe085a..a0aed574d064249d38e9e5540f488ea190bd8024 100755
--- a/tutorials/multiphase/interDyMFoam/RAS/DTCHull/Allclean
+++ b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/Allclean
@@ -4,14 +4,13 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-# remove surface
-rm -f constant/triSurface/DTC-scaled.stl.gz > /dev/null 2>&1
-rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
-rm -f constant/triSurface/DTC-scaled.eMesh > /dev/null 2>&1
-
 cleanCase
-rm constant/polyMesh/boundary > /dev/null 2>&1
-rm -rf 0 > /dev/null 2>&1
+rm -rf 0
 rm system/topoSetDict > /dev/null 2>&1
 
+# Remove surface and features
+rm -f constant/triSurface/DTC-scaled.stl.gz > /dev/null 2>&1
+rm -f constant/triSurface/DTC-scaled.eMesh  > /dev/null 2>&1
+rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
+
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/Allclean b/tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/Allclean
index d1295e344e28bdc2c1cd172ed7721348a2eeda0e..c9e8210d7785ce379488320db64f2ce1e004a3df 100755
--- a/tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/Allclean
+++ b/tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/Allclean
@@ -4,9 +4,9 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-rm system/cellSetDict > /dev/null 2>&1
-rm -rf 0 > /dev/null 2>&1
-
 cleanCase
+rm -rf 0
+
+rm system/cellSetDict > /dev/null 2>&1
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interDyMFoam/RAS/floatingObject/Allclean b/tutorials/multiphase/interDyMFoam/RAS/floatingObject/Allclean
index 5734444f4e74e87d3d685ad82df35bcb7e3b300e..61edfb303237d95429c1833e5f77dfbfd671288b 100755
--- a/tutorials/multiphase/interDyMFoam/RAS/floatingObject/Allclean
+++ b/tutorials/multiphase/interDyMFoam/RAS/floatingObject/Allclean
@@ -4,8 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-rm -rf 0 > /dev/null 2>&1
-
 cleanCase
+rm -rf 0
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/Allclean b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/Allclean
index 83230a683ee7c7ae55f14e972fce04cf9fa1d637..d3b4c4257f3c7936b982bd6a0126c8e29d346331 100755
--- a/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/Allclean
+++ b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/Allclean
@@ -5,8 +5,8 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
-
 rm -rf 0 > /dev/null 2>&1
+
 rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
 rm -f constant/triSurface/*.eMesh* > /dev/null 2>&1
 
diff --git a/tutorials/multiphase/interDyMFoam/RAS/motorBike/Allclean b/tutorials/multiphase/interDyMFoam/RAS/motorBike/Allclean
index 9a3f86fc055e189be3141a8ee86ce0b0131aa10d..29141d9f9bafbce5ead5f03ac5af0de7f993bb8b 100755
--- a/tutorials/multiphase/interDyMFoam/RAS/motorBike/Allclean
+++ b/tutorials/multiphase/interDyMFoam/RAS/motorBike/Allclean
@@ -1,17 +1,17 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-# remove surface and features
-\rm -f constant/triSurface/motorBike.obj.gz > /dev/null 2>&1
-\rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
-\rm -f constant/triSurface/motorBike.eMesh > /dev/null 2>&1
-
-rm -rf 0 > /dev/null 2>&1
-
 cleanCase
+rm -rf 0
 
-\rm -f constant/polyMesh/boundary
+# Remove surface and features
+\rm -f  constant/triSurface/motorBike.obj.gz > /dev/null 2>&1
+\rm -f  constant/triSurface/motorBike.eMesh  > /dev/null 2>&1
+\rm -rf constant/extendedFeatureEdgeMesh     > /dev/null 2>&1
 
 \cp system/controlDict_run system/controlDict
+
+# -----------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interDyMFoam/RAS/motorBike/Allrun b/tutorials/multiphase/interDyMFoam/RAS/motorBike/Allrun
index 776643da4d51a8c8abf1bd675f64e018fc865fb7..8c8ea78f795dae0ee3f0165f3ca4c5a62d259215 100755
--- a/tutorials/multiphase/interDyMFoam/RAS/motorBike/Allrun
+++ b/tutorials/multiphase/interDyMFoam/RAS/motorBike/Allrun
@@ -17,4 +17,4 @@ runParallel -s decompose redistributePar -decompose -latestTime
 runParallel -s restart $(getApplication)
 
 
-# ----------------------------------------------------------------- end-of-file
+# -----------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/Allclean b/tutorials/multiphase/interFoam/RAS/DTCHull/Allclean
index e3e304dace9b32b33ff744ce134c16fe06fe085a..0086cd47cb0c88353f0f5d331b776065c012843e 100755
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/Allclean
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/Allclean
@@ -4,14 +4,14 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-# remove surface
-rm -f constant/triSurface/DTC-scaled.stl.gz > /dev/null 2>&1
-rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
-rm -f constant/triSurface/DTC-scaled.eMesh > /dev/null 2>&1
-
 cleanCase
-rm constant/polyMesh/boundary > /dev/null 2>&1
-rm -rf 0 > /dev/null 2>&1
+rm -rf 0
+
 rm system/topoSetDict > /dev/null 2>&1
 
+# Remove surfaces and features
+rm -f  constant/triSurface/DTC-scaled.stl.gz > /dev/null 2>&1
+rm -f  constant/triSurface/DTC-scaled.eMesh  > /dev/null 2>&1
+rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
+
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/Allclean b/tutorials/multiphase/interFoam/RAS/waterChannel/Allclean
index ac0e3978c2574c24fe0ce72e47d4b9a502136d8f..e67e3024e8823c4993864eb0c326a34feafe2e51 100755
--- a/tutorials/multiphase/interFoam/RAS/waterChannel/Allclean
+++ b/tutorials/multiphase/interFoam/RAS/waterChannel/Allclean
@@ -4,7 +4,9 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
+cleanCase
+
 rm 0/alpha.water.gz 0/alpha.water 2>/dev/null
 rm -rf *Flux
 
-cleanCase
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/Allclean b/tutorials/multiphase/interFoam/RAS/weirOverflow/Allclean
index 2c5a008802e8e91116267233274623cc5c062969..61edfb303237d95429c1833e5f77dfbfd671288b 100755
--- a/tutorials/multiphase/interFoam/RAS/weirOverflow/Allclean
+++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/Allclean
@@ -1,8 +1,10 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-rm -rf 0 > /dev/null 2>&1
-
 cleanCase
+rm -rf 0
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allclean b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allclean
index 496837c14e38ea0b4554af1025abfc9c3a42f380..af5bf72167e93bbc40554a13d2fe609f4b060fb2 100755
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allclean
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allclean
@@ -4,11 +4,12 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-# remove surface
-rm -f constant/triSurface/propellerTip.obj.gz > /dev/null 2>&1
-
 cleanCase
-
 rm -rf 0 > /dev/null 2>&1
-rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
+
+# Remove surface
+rm -f constant/triSurface/propellerTip.obj.gz > /dev/null 2>&1
 rm -f constant/triSurface/*.eMesh* > /dev/null 2>&1
+rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun
index 3f7cab5d82e34e43d25b7b1a4dfbe80e21a7248f..59aa02e75334f55ae5a577dd73802e70d1397ab1 100755
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun
@@ -11,3 +11,5 @@ runApplication decomposePar
 runParallel $(getApplication)
 
 runApplication reconstructPar
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre
index b62fc66a8c6d6aa7de9e3963f4e90fcf1c073583..b9980dd726d164462fc7aeaadf21dddd874aab43 100755
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre
@@ -36,3 +36,5 @@ runApplication createPatch -overwrite
 # - apply the initial fields
 
 restore0Dir
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allclean b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allclean
index 42c58bf0eb3cfe23434910e26255304e09315346..05fe1e79a3f91a15ed06385847d37e4424a41eed 100755
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allclean
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allclean
@@ -4,12 +4,10 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
+cleanCase
+rm -rf 0
+
 # Remove surface
 rm -f constant/triSurface/bullet.stl.gz
 
-# Remove 0.orig/ copy
-\rm -rf 0
-
-cleanCase
-
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/Allclean b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/Allclean
index 9f691c93851e250425529116772e1d82b81075f2..61edfb303237d95429c1833e5f77dfbfd671288b 100755
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/Allclean
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/Allclean
@@ -5,7 +5,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
-
 rm -rf 0
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/Allclean b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/Allclean
index 9f691c93851e250425529116772e1d82b81075f2..61edfb303237d95429c1833e5f77dfbfd671288b 100755
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/Allclean
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/Allclean
@@ -5,7 +5,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
-
 rm -rf 0
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allclean b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allclean
index 9f691c93851e250425529116772e1d82b81075f2..61edfb303237d95429c1833e5f77dfbfd671288b 100755
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allclean
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allclean
@@ -5,7 +5,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
-
 rm -rf 0
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allclean b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allclean
index 9f691c93851e250425529116772e1d82b81075f2..61edfb303237d95429c1833e5f77dfbfd671288b 100755
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allclean
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allclean
@@ -5,7 +5,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
-
 rm -rf 0
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/Allclean b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/Allclean
index a0dbe45d86fea7549fc4e8deedee16c082fd4e3d..5b17237826694a15efc621c2bb2dfb6a91c1d66b 100755
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/Allclean
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/Allclean
@@ -1,10 +1,11 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-# Source tutorial run functions
+# Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
-
 rm -rf 0
 rm -rf poolHeight poolHeight_vs_time
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/Allclean b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/Allclean
index a0dbe45d86fea7549fc4e8deedee16c082fd4e3d..5b17237826694a15efc621c2bb2dfb6a91c1d66b 100755
--- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/Allclean
+++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/Allclean
@@ -1,10 +1,11 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-# Source tutorial run functions
+# Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
-
 rm -rf 0
 rm -rf poolHeight poolHeight_vs_time
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/Allclean b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/Allclean
index 9f691c93851e250425529116772e1d82b81075f2..61edfb303237d95429c1833e5f77dfbfd671288b 100755
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/Allclean
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/Allclean
@@ -5,7 +5,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
-
 rm -rf 0
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/preProcessing/createZeroDirectory/cavity/Allclean b/tutorials/preProcessing/createZeroDirectory/cavity/Allclean
index 2c5a008802e8e91116267233274623cc5c062969..61edfb303237d95429c1833e5f77dfbfd671288b 100755
--- a/tutorials/preProcessing/createZeroDirectory/cavity/Allclean
+++ b/tutorials/preProcessing/createZeroDirectory/cavity/Allclean
@@ -1,8 +1,10 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-rm -rf 0 > /dev/null 2>&1
-
 cleanCase
+rm -rf 0
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/preProcessing/createZeroDirectory/motorBike/Allclean b/tutorials/preProcessing/createZeroDirectory/motorBike/Allclean
index 17464e7020d3cbe606b694c058f2d1c71d24a128..7ba7ddabb3e7e1a730041832e59aa864abfc256b 100755
--- a/tutorials/preProcessing/createZeroDirectory/motorBike/Allclean
+++ b/tutorials/preProcessing/createZeroDirectory/motorBike/Allclean
@@ -1,13 +1,15 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-# remove surface and features
-\rm -f constant/triSurface/motorBike.obj.gz > /dev/null 2>&1
-\rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
-\rm -f constant/triSurface/motorBike.eMesh > /dev/null 2>&1
+cleanCase
+rm -rf 0
 
-rm -rf 0 > /dev/null 2>&1
+# Remove surface and features
+\rm -f constant/triSurface/motorBike.obj.gz > /dev/null 2>&1
+\rm -f constant/triSurface/motorBike.eMesh  > /dev/null 2>&1
+\rm -rf constant/extendedFeatureEdgeMesh    > /dev/null 2>&1
 
-cleanCase
+#------------------------------------------------------------------------------
diff --git a/tutorials/preProcessing/createZeroDirectory/motorBike/Allrun b/tutorials/preProcessing/createZeroDirectory/motorBike/Allrun
index 4ca1ac1c2970e1754e8a3816a0fdece054782150..dbb00a2dbb2ba88a4326318b8eddbe1392578210 100755
--- a/tutorials/preProcessing/createZeroDirectory/motorBike/Allrun
+++ b/tutorials/preProcessing/createZeroDirectory/motorBike/Allrun
@@ -22,4 +22,4 @@ runParallel $(getApplication)
 runApplication reconstructParMesh -constant
 runApplication reconstructPar -latestTime
 
-# ----------------------------------------------------------------- end-of-file
+# -----------------------------------------------------------------------------
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/Allclean b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/Allclean
index 44f1fb098f5d57d3d502cdda198660a8bc20870c..18b6490f109754978433ce39969e103d5a0becd8 100755
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/Allclean
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/Allclean
@@ -4,18 +4,17 @@ cd ${0%/*} || exit 1    # run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
+cleanCase
+rm -rf 0
+
 rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
 rm -f constant/triSurface/*.eMesh > /dev/null 2>&1
-rm -f constant/polyMesh/boundary
 
-cleanCase
 rm -rf VTK
-rm -rf constant/cellToRegion constant/polyMesh/sets
-rm -rf 0
 rm -rf constant/bottomAir/polyMesh
 rm -rf constant/topAir/polyMesh
 rm -rf constant/heater/polyMesh
 rm -rf constant/leftSolid/polyMesh
 rm -rf constant/rightSolid/polyMesh
 
-# ----------------------------------------------------------------- end-of-file
+# -----------------------------------------------------------------------------
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/Allrun b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/Allrun
index 56e9b1ea90165eedfb9ad600c27f607890c7c7cb..fded3a87586dd15fb28b9fbbfee3a366f9401a2b 100755
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/Allrun
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/Allrun
@@ -1,7 +1,6 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
 
-
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
@@ -36,4 +35,4 @@ echo "creating files for paraview post-processing"
 echo
 paraFoam -touchAll
 
-# ----------------------------------------------------------------- end-of-file
+# -----------------------------------------------------------------------------