diff --git a/etc/caseDicts/annotated/surfaceSubsetDict b/etc/caseDicts/annotated/surfaceSubsetDict
index c7251c51c8..1d3c450643 100644
--- a/etc/caseDicts/annotated/surfaceSubsetDict
+++ b/etc/caseDicts/annotated/surfaceSubsetDict
@@ -42,15 +42,10 @@ surface
 plane
 {
     planeType embeddedPoints;
-    embeddedPointsDict
-    {
-        // point1 (-937.259845440205 160.865349115986 240.738791238078);
-        // point2 (-934.767379895778 9.63875523747379 14.412359671298);
-        // point3 (44.4744688899417 121.852927962709 182.352485273106);
-        point1 (-957.895294591874 242.865936478961 162.286611511875);
-        point2 (-961.43140327772 4.53895551562943 3.04159982093444);
-        point3 (91.2414146173805 72.1504381996692 48.2181961945329);
-    }
+
+    point1 (-957.895294591874 242.865936478961 162.286611511875);
+    point2 (-961.43140327772 4.53895551562943 3.04159982093444);
+    point3 (91.2414146173805 72.1504381996692 48.2181961945329);
 
     // Distance from plane
     distance 0.1;
diff --git a/etc/caseDicts/postProcessing/visualization/surfaces.cfg b/etc/caseDicts/postProcessing/visualization/surfaces.cfg
index 2f70611c22..97f089cbc7 100644
--- a/etc/caseDicts/postProcessing/visualization/surfaces.cfg
+++ b/etc/caseDicts/postProcessing/visualization/surfaces.cfg
@@ -23,11 +23,8 @@ cuttingPlane
 {
     type         cuttingPlane;
     planeType    pointAndNormal;
-    pointAndNormalDict
-    {
-        basePoint    $origin;
-        normalVector $x;
-    }
+    point        $origin;
+    normal       $x;
     interpolate  true;
 }
 
diff --git a/tutorials/compressible/rhoCentralFoam/movingCone/system/cuttingPlane b/tutorials/compressible/rhoCentralFoam/movingCone/system/cuttingPlane
index eabc6479c4..9a2bf8a88b 100644
--- a/tutorials/compressible/rhoCentralFoam/movingCone/system/cuttingPlane
+++ b/tutorials/compressible/rhoCentralFoam/movingCone/system/cuttingPlane
@@ -24,11 +24,8 @@ cuttingPlane
         {
             type            cuttingPlane;
             planeType       pointAndNormal;
-            pointAndNormalDict
-            {
-                point   (0 0 0);
-                normal  (0 0 1);
-            }
+            point           (0 0 0);
+            normal          (0 0 1);
             interpolate     true;
         }
     );
diff --git a/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/system/mirrorMeshDict.x b/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/system/mirrorMeshDict.x
index 0a3f2ae7e8..af6c1a9a09 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/system/mirrorMeshDict.x
+++ b/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/system/mirrorMeshDict.x
@@ -17,11 +17,8 @@ FoamFile
 
 planeType       pointAndNormal;
 
-pointAndNormalDict
-{
-    point   (0 0 0);
-    normal  (-1 0 0);
-}
+point           (0 0 0);
+normal          (-1 0 0);
 
 planeTolerance  1e-06;
 
diff --git a/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/system/mirrorMeshDict.y b/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/system/mirrorMeshDict.y
index c4fc881bf8..bd8a8c36f2 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/system/mirrorMeshDict.y
+++ b/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/system/mirrorMeshDict.y
@@ -17,11 +17,8 @@ FoamFile
 
 planeType       pointAndNormal;
 
-pointAndNormalDict
-{
-    point   (0 0 0);
-    normal  (0 -1 0);
-}
+point           (0 0 0);
+normal          (0 -1 0);
 
 planeTolerance  1e-06;
 
diff --git a/tutorials/incompressible/pimpleFoam/RAS/propeller/system/surfaces b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/surfaces
index c29bc9ec55..df45a84809 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/propeller/system/surfaces
+++ b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/surfaces
@@ -24,11 +24,8 @@ surfaces
         {
             type            cuttingPlane;
             planeType       pointAndNormal;
-            pointAndNormalDict
-            {
-                point   (0 0 0);
-                normal  (0 0 1);
-            }
+            point           (0 0 0);
+            normal          (0 0 1);
             interpolate     true;
         }
 
diff --git a/tutorials/incompressible/pimpleFoam/laminar/movingCone/system/cuttingPlane b/tutorials/incompressible/pimpleFoam/laminar/movingCone/system/cuttingPlane
index d65dd1f369..4ac0fe3341 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/movingCone/system/cuttingPlane
+++ b/tutorials/incompressible/pimpleFoam/laminar/movingCone/system/cuttingPlane
@@ -25,11 +25,8 @@ cuttingPlane
         {
             type            cuttingPlane;
             planeType       pointAndNormal;
-            pointAndNormalDict
-            {
-                point   (0 0 0);
-                normal  (0 0 1);
-            }
+            point           (0 0 0);
+            normal          (0 0 1);
             interpolate     true;
         }
     );
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/cuttingPlane b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/cuttingPlane
index 68dd1a5b9e..b07e6f4434 100644
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/cuttingPlane
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/cuttingPlane
@@ -24,11 +24,8 @@ cuttingPlane
         {
             type            cuttingPlane;
             planeType       pointAndNormal;
-            pointAndNormalDict
-            {
-                point   (0 0 0);
-                normal  (0 1 0);
-            }
+            point           (0 0 0);
+            normal          (0 1 0);
             interpolate     true;
         }
     );
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/cuttingPlane b/tutorials/incompressible/simpleFoam/motorBike/system/cuttingPlane
index 4cebf3d657..5a036cfdd9 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/cuttingPlane
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/cuttingPlane
@@ -23,11 +23,8 @@ cuttingPlane
         {
             type            cuttingPlane;
             planeType       pointAndNormal;
-            pointAndNormalDict
-            {
-                point   (0 0 0);
-                normal  (0 1 0);
-            }
+            point           (0 0 0);
+            normal          (0 1 0);
             interpolate     true;
         }
     );