diff --git a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTrackProperties b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTrackProperties
index 03e6c8c24..cbeb6745d 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 ee97b1ffa..ddbea97f5 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 aafb38bfb..e7117a471 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 2973d94ff..a150a5d55 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 80dd5a310..2aa458c57 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 6e6918f36..e3bbdcd38 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 26cecc447..08e6145db 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 3b60eb97c..ee8b85eb2 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 8daa2f853..bce6e2db9 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
         {