diff --git a/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.C b/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.C
index e4e37b75c3..ac2457010d 100644
--- a/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.C
+++ b/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.C
@@ -102,7 +102,7 @@ Foam::fileName Foam::ensightSurfaceWriter::write
     ensightGeoFile osGeom
     (
         outputDir,
-        surfName + ".000000.mesh",
+        surfName + ".00000000.mesh",
         writeFormat_
     );
 
diff --git a/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriterTemplates.C b/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriterTemplates.C
index b314b7b479..41c404deb6 100644
--- a/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriterTemplates.C
+++ b/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriterTemplates.C
@@ -78,13 +78,13 @@ Foam::fileName Foam::ensightSurfaceWriter::writeUncollated
     ensightGeoFile osGeom
     (
         baseDir,
-        surfName + ".000000.mesh",
+        surfName + ".00000000.mesh",
         writeFormat_
     );
     ensightFile osField
     (
         baseDir,
-        surfName + ".000000." + varName,
+        surfName + ".00000000." + varName,
         writeFormat_
     );
 
diff --git a/tutorials/incompressible/icoFoam/cavity/cavity/system/controlDict b/tutorials/incompressible/icoFoam/cavity/cavity/system/controlDict
index 4ce3008226..78ef7651b9 100644
--- a/tutorials/incompressible/icoFoam/cavity/cavity/system/controlDict
+++ b/tutorials/incompressible/icoFoam/cavity/cavity/system/controlDict
@@ -45,39 +45,5 @@ timePrecision   6;
 
 runTimeModifiable true;
 
-functions
-{
-  cuttingPlane
-  {
-      type            surfaces;
-      functionObjectLibs ("libsampling.so");
-      outputControl   timeStep;       //outputTime;
-      outputInterval  4;
-
-      surfaceFormat   ensight;
-      formatOptions
-      {
-//          ensight { format binary; collateTimes true;}
-      }
-      fields          (p U);
-
-      interpolationScheme cellPoint;
-
-      surfaces
-      (
-          zNormal_0.0
-          {
-              type            cuttingPlane;
-              planeType       pointAndNormal;
-              pointAndNormalDict
-              {
-                  basePoint       (0 0 0.005);
-                  normalVector    (0 0 1);
-              }
-              interpolate     true;
-          }
-      );
-  }
-}
 
 // ************************************************************************* //