diff --git a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTrackProperties b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTrackProperties
index 03e6c8c243779039604df5fa6c58133967fe6d26..cbeb6745da90102a4048194953d5c34007dc1b62 100644
--- a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTrackProperties
+++ b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTrackProperties
@@ -20,6 +20,6 @@ sampleFrequency 1;
 
 maxPositions    1000000;
 
-setFormat       vtk;    // see sampleDict for set formats
+setFormat       vtk;
 
 // ************************************************************************* //
diff --git a/src/functionObjects/field/streamLine/controlDict b/src/functionObjects/field/streamLine/controlDict
index ee97b1ffa253d95b154184fff1f286b5616e1b83..ddbea97f57827499fcf7956cca9d074307116491 100644
--- a/src/functionObjects/field/streamLine/controlDict
+++ b/src/functionObjects/field/streamLine/controlDict
@@ -57,10 +57,10 @@ functions
         writeControl   writeTime;
         // writeInterval 10;
 
-        setFormat       vtk; //gnuplot, raw etc. See sampleDict.
+        setFormat       vtk; // gnuplot, raw etc.
 
-        // Interpolation method. Default is cellPoint. See sampleDict.
-        //interpolationScheme pointMVC;
+        // Interpolation method. Default is cellPoint.
+        // interpolationScheme pointMVC;
 
         // Tracked forwards (+U) or backwards (-U)
         trackForward    true;
@@ -84,8 +84,8 @@ functions
         // Cloud name to use
         cloudName       particleTracks;
 
-        // Seeding method. See the sampleSets in sampleDict.
-        seedSampleSet   uniform;  //cloud;//triSurfaceMeshPointSet;
+        // Seeding method.
+        seedSampleSet   uniform;  // cloud; //triSurfaceMeshPointSet;
 
         uniformCoeffs
         {
diff --git a/src/functionObjects/field/wallBoundedStreamLine/controlDict b/src/functionObjects/field/wallBoundedStreamLine/controlDict
index aafb38bfb2c907e5a58dd52bfc4b0d84e0111a21..e7117a471a79e89e81b838309c73d48b4f5f996c 100644
--- a/src/functionObjects/field/wallBoundedStreamLine/controlDict
+++ b/src/functionObjects/field/wallBoundedStreamLine/controlDict
@@ -94,8 +94,8 @@ functions
         // Velocity field to use for tracking.
         U UNear;
 
-        // Interpolation method. Default is cellPoint. See sampleDict.
-        //interpolationScheme pointMVC;
+        // Interpolation method. Default is cellPoint.
+        // interpolationScheme pointMVC;
 
         // Tracked forwards (+U) or backwards (-U)
         trackForward    true;
@@ -115,8 +115,8 @@ functions
         // Cloud name to use
         cloudName       particleTracks;
 
-        // Seeding method. See the sampleSets in sampleDict.
-        seedSampleSet   patchSeed;    //cloud;//triSurfaceMeshPointSet;
+        // Seeding method.
+        seedSampleSet   patchSeed;    //cloud; //triSurfaceMeshPointSet;
 
         uniformCoeffs
         {
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/system/sample b/tutorials/electromagnetics/mhdFoam/hartmann/system/sample
index 2973d94fffdaab31a0621cb04d9b2f7f50d4d668..a150a5d555dd4ca7ead15847e46cd85cee720c8c 100644
--- a/tutorials/electromagnetics/mhdFoam/hartmann/system/sample
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/system/sample
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "system";
-    object      sampleDict;
+    object      sample;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/streamLines b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/streamLines
index 80dd5a310c29eaa3898cbe099a11ca24b4f962a4..2aa458c572e653eb5fa60a9a377e374b1818583a 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/streamLines
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/streamLines
@@ -31,8 +31,8 @@ streamLines
     // Cloud name to use
     cloudName       particleTracks;
 
-    // Seeding method. See the sampleSets in sampleDict.
-    seedSampleSet   uniform;  //cloud;//triSurfaceMeshPointSet;
+    // Seeding method.
+    seedSampleSet   uniform;  //cloud; //triSurfaceMeshPointSet;
 
     uniformCoeffs
     {
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/streamLines b/tutorials/incompressible/simpleFoam/motorBike/system/streamLines
index 6e6918f36a80145e4395a16a8f40e58bde35162c..e3bbdcd380d3a515dbf89d7912408e0e7b997cbf 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/streamLines
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/streamLines
@@ -41,8 +41,8 @@ streamLines
     // Cloud name to use
     cloudName       particleTracks;
 
-    // Seeding method. See the sampleSets in sampleDict.
-    seedSampleSet   uniform;  //cloud;//triSurfaceMeshPointSet;
+    // Seeding method.
+    seedSampleSet   uniform;  //cloud; //triSurfaceMeshPointSet;
 
     uniformCoeffs
     {
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines b/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines
index 26cecc44783fbe77999fc6976fdee6a327e1775a..08e6145db509bf1beb6979622fb9f75dc277db0a 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines
@@ -50,8 +50,8 @@ wallBoundedStreamLines
     // Velocity field to use for tracking.
     U     UNear;
 
-    // Interpolation method. Default is cellPoint. See sampleDict.
-    //interpolationScheme pointMVC;
+    // Interpolation method. Default is cellPoint.
+    // interpolationScheme pointMVC;
 
     // Tracked forwards (+U) or backwards (-U)
     trackForward    true;
@@ -67,8 +67,8 @@ wallBoundedStreamLines
     // Cloud name to use
     cloudName       wallBoundedParticleTracks;
 
-    // Seeding method. See the sampleSets in sampleDict.
-    seedSampleSet   patchSeed;    //cloud;//triSurfaceMeshPointSet;
+    // Seeding method.
+    seedSampleSet   patchSeed;    //cloud; //triSurfaceMeshPointSet;
 
     uniformCoeffs
     {
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict b/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict
index 3b60eb97cf1f4fefa7576da4e3efab241d85dad0..ee8b85eb23942206cdcd44ce35bedbf895cd84c3 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict
@@ -75,8 +75,8 @@ functions
         // Cloud name to use
         cloudName       particleTracks;
 
-        // Seeding method. See the sampleSets in sampleDict.
-        seedSampleSet   uniform;  //cloud;//triSurfaceMeshPointSet;
+        // Seeding method.
+        seedSampleSet   uniform;  //cloud; //triSurfaceMeshPointSet;
 
         uniformCoeffs
         {
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
index 8daa2f853f22502e08ab5cf18b3b3a03b3f3caeb..bce6e2db918ba08a06654f60c2fb9149d1313ad5 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
@@ -75,8 +75,8 @@ functions
         // Cloud name to use
         cloudName       particleTracks;
 
-        // Seeding method. See the sampleSets in sampleDict.
-        seedSampleSet   uniform;  //cloud;//triSurfaceMeshPointSet;
+        // Seeding method.
+        seedSampleSet   uniform;  //cloud; //triSurfaceMeshPointSet;
 
         uniformCoeffs
         {