diff --git a/bin/tools/CleanFunctions b/bin/tools/CleanFunctions
index a0a667c604..91867f1051 100644
--- a/bin/tools/CleanFunctions
+++ b/bin/tools/CleanFunctions
@@ -97,29 +97,24 @@ cleanCase()
     rm -rf surfaceSampling > /dev/null 2>&1
     rm -rf cuttingPlane > /dev/null 2>&1
     rm -rf system/machines > /dev/null 2>&1
+    rm -rf Ensight EnSight ensightWrite VTK > /dev/null 2>&1
 
     # From mpirunDebug
     rm -f gdbCommands  mpirun.schema
 
     cleanSnappyFiles
-    if [ -d constant/polyMesh ]
-    then
-        rm -rf constant/polyMesh > /dev/null 2>&1
-    fi
+    rm -f 0/cellDist > /dev/null 2>&1
+
     if [ -d constant ]
     then
         (cd constant && \
             rm -rf \
-            cellToRegion cellLevel* pointLevel* \
+            cellDecomposition cellToRegion cellLevel* pointLevel* \
+            polyMesh tetDualMesh \
             > /dev/null 2>&1 \
         )
     fi
 
-    rm -rf constant/tetDualMesh > /dev/null 2>&1
-
-    rm -rf VTK > /dev/null 2>&1
-    rm -f 0/cellLevel 0/pointLevel 0/cellDist constant/cellDecomposition
-
     if [ -e system/blockMeshDict.m4 ]
     then
         rm -f system/blockMeshDict > /dev/null 2>&1
@@ -130,7 +125,7 @@ cleanCase()
 removeCase()
 {
     echo "Removing ${1:-unknown} case"
-    rm -rf $1
+    [ "$#" -ge 1 ] && rm -rf "$1"
 }