diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/files b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/files
new file mode 100644
index 0000000000..dfee7d7d19
--- /dev/null
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/files
@@ -0,0 +1,3 @@
+porousExplicitSourceReactingParcelFoam.C
+
+EXE = $(FOAM_APPBIN)/porousExplicitSourceReactingParcelFoam
diff --git a/applications/solvers/lagrangian/trackedReactingParcelFoam/Make/options b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options
similarity index 100%
rename from applications/solvers/lagrangian/trackedReactingParcelFoam/Make/options
rename to applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options
diff --git a/applications/solvers/lagrangian/trackedReactingParcelFoam/UEqn.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/UEqn.H
similarity index 100%
rename from applications/solvers/lagrangian/trackedReactingParcelFoam/UEqn.H
rename to applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/UEqn.H
diff --git a/applications/solvers/lagrangian/trackedReactingParcelFoam/YEqn.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/YEqn.H
similarity index 100%
rename from applications/solvers/lagrangian/trackedReactingParcelFoam/YEqn.H
rename to applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/YEqn.H
diff --git a/applications/solvers/lagrangian/trackedReactingParcelFoam/chemistry.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/chemistry.H
similarity index 100%
rename from applications/solvers/lagrangian/trackedReactingParcelFoam/chemistry.H
rename to applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/chemistry.H
diff --git a/applications/solvers/lagrangian/trackedReactingParcelFoam/createClouds.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createClouds.H
similarity index 65%
rename from applications/solvers/lagrangian/trackedReactingParcelFoam/createClouds.H
rename to applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createClouds.H
index d22b75f485..728e605e57 100644
--- a/applications/solvers/lagrangian/trackedReactingParcelFoam/createClouds.H
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createClouds.H
@@ -1,5 +1,5 @@
 Info<< "\nConstructing reacting cloud" << endl;
-BasicTrackedReactingCloud<icoPoly8ThermoPhysics> parcels
+BasicReactingCloud<icoPoly8ThermoPhysics> parcels
 (
     "reactingCloud1",
     rho,
diff --git a/applications/solvers/lagrangian/trackedReactingParcelFoam/createFields.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createFields.H
similarity index 100%
rename from applications/solvers/lagrangian/trackedReactingParcelFoam/createFields.H
rename to applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createFields.H
diff --git a/applications/solvers/lagrangian/trackedReactingParcelFoam/createMulticomponentPointSources.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createMulticomponentPointSources.H
similarity index 100%
rename from applications/solvers/lagrangian/trackedReactingParcelFoam/createMulticomponentPointSources.H
rename to applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createMulticomponentPointSources.H
diff --git a/applications/solvers/lagrangian/trackedReactingParcelFoam/createPorousZones.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createPorousZones.H
similarity index 100%
rename from applications/solvers/lagrangian/trackedReactingParcelFoam/createPorousZones.H
rename to applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createPorousZones.H
diff --git a/applications/solvers/lagrangian/trackedReactingParcelFoam/hEqn.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/hEqn.H
similarity index 100%
rename from applications/solvers/lagrangian/trackedReactingParcelFoam/hEqn.H
rename to applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/hEqn.H
diff --git a/applications/solvers/lagrangian/trackedReactingParcelFoam/pEqn.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/pEqn.H
similarity index 100%
rename from applications/solvers/lagrangian/trackedReactingParcelFoam/pEqn.H
rename to applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/pEqn.H
diff --git a/applications/solvers/lagrangian/trackedReactingParcelFoam/trackedReactingParcelFoam.C b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C
similarity index 98%
rename from applications/solvers/lagrangian/trackedReactingParcelFoam/trackedReactingParcelFoam.C
rename to applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C
index b285faf1cf..3db0d3827d 100644
--- a/applications/solvers/lagrangian/trackedReactingParcelFoam/trackedReactingParcelFoam.C
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C
@@ -38,7 +38,7 @@ Description
 #include "fvCFD.H"
 #include "hReactionThermo.H"
 #include "turbulenceModel.H"
-#include "BasicTrackedReactingCloud.H"
+#include "BasicReactingCloud.H"
 #include "rhoChemistryModel.H"
 #include "chemistrySolver.H"
 #include "thermoPhysicsTypes.H"
diff --git a/applications/solvers/lagrangian/trackedReactingParcelFoam/readChemistryProperties.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/readChemistryProperties.H
similarity index 100%
rename from applications/solvers/lagrangian/trackedReactingParcelFoam/readChemistryProperties.H
rename to applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/readChemistryProperties.H
diff --git a/applications/solvers/lagrangian/trackedReactingParcelFoam/rhoEqn.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/rhoEqn.H
similarity index 100%
rename from applications/solvers/lagrangian/trackedReactingParcelFoam/rhoEqn.H
rename to applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/rhoEqn.H
diff --git a/applications/solvers/lagrangian/trackedReactingParcelFoam/Make/files b/applications/solvers/lagrangian/trackedReactingParcelFoam/Make/files
deleted file mode 100644
index 90e8aa5b4b..0000000000
--- a/applications/solvers/lagrangian/trackedReactingParcelFoam/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-trackedReactingParcelFoam.C
-
-EXE = $(FOAM_APPBIN)/trackedReactingParcelFoam
diff --git a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
index 0555309348..0c88172f7c 100644
--- a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
+++ b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
@@ -46,14 +46,17 @@ using namespace Foam;
 
 int main(int argc, char *argv[])
 {
-#   include "setRootCase.H"
+    #include "setRootCase.H"
 
-#   include "createTime.H"
+    #include "createTime.H"
     instantList timeDirs = timeSelector::select0(runTime, args);
-#   include "createMesh.H"
-#   include "createFields.H"
+    #include "createMesh.H"
+    #include "createFields.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+    fileName vtkPath(runTime.path()/"VTK");
+    mkDir(vtkPath);
 
     Info<< "Scanning times to determine track data" << nl << endl;
 
@@ -63,29 +66,28 @@ int main(int argc, char *argv[])
         runTime.setTime(timeDirs[timeI], timeI);
         Info<< "Time = " << runTime.timeName() << endl;
 
-        IOobject origProcHeader
+        IOobject positionsHeader
         (
-            "origProc",
+            "positions",
             runTime.timeName(),
             cloud::prefix/cloudName,
             mesh,
-            IOobject::MUST_READ
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE,
+            false
         );
-        IOobject idHeader
-        (
-            "id",
-            runTime.timeName(),
-            cloud::prefix/cloudName,
-            mesh,
-            IOobject::MUST_READ
-        );
-        if (idHeader.headerOk() && origProcHeader.headerOk())
+
+        if (positionsHeader.headerOk())
         {
-            IOField<label> origProc(origProcHeader);
-            IOField<label> id(idHeader);
-            forAll(id, i)
+            Info<< "    Reading particle positions" << endl;
+            Cloud<passiveParticle> myCloud(mesh, cloudName, false);
+
+            forAllConstIter(Cloud<passiveParticle>, myCloud, iter)
             {
-                maxIds[origProc[i]] = max(maxIds[origProc[i]], id[i]);
+                label origId = iter().origId();
+                label origProc = iter().origProc();
+
+                maxIds[origProc] = max(maxIds[origProc], origId);
             }
         }
     }
@@ -124,60 +126,35 @@ int main(int argc, char *argv[])
             false
         );
 
-        IOobject origProcHeader
-        (
-            "origProc",
-            runTime.timeName(),
-            cloud::prefix/cloudName,
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::NO_WRITE,
-            false
-        );
-
-        IOobject idHeader
-        (
-            "id",
-            runTime.timeName(),
-            cloud::prefix/cloudName,
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::NO_WRITE,
-            false
-        );
-
-        if
-        (
-            positionsHeader.headerOk()
-         && origProcHeader.headerOk()
-         && idHeader.headerOk()
-        )
+        if (positionsHeader.headerOk())
         {
             Info<< "    Reading particle positions" << endl;
             Cloud<passiveParticle> myCloud(mesh, cloudName, false);
 
-            Info<< "    Reading particle id" << endl;
-            IOField<label> id(idHeader);
-
-            Info<< "    Reading particle origProc" << endl;
-            IOField<label> origProc(origProcHeader);
-
             // collect the track data on the master processor
-            label i = 0;
             List<pointField> allPositions(Pstream::nProcs());
-            allPositions[Pstream::myProcNo()].setSize(myCloud.size());
+            allPositions[Pstream::myProcNo()].setSize
+            (
+                myCloud.size(),
+                point::zero
+            );
+
+            List<labelField> allOrigIds(Pstream::nProcs());
+            allOrigIds[Pstream::myProcNo()].setSize(myCloud.size(), 0);
+
+            List<labelField> allOrigProcs(Pstream::nProcs());
+            allOrigProcs[Pstream::myProcNo()].setSize(myCloud.size(), 0);
+
+            label i = 0;
             forAllConstIter(Cloud<passiveParticle>, myCloud, iter)
             {
-                allPositions[Pstream::myProcNo()][i++] = iter().position();
+                allPositions[Pstream::myProcNo()][i] = iter().position();
+                allOrigIds[Pstream::myProcNo()][i] = iter().origId();
+                allOrigProcs[Pstream::myProcNo()][i] = iter().origProc();
+                i++;
             }
             Pstream::gatherList(allPositions);
-
-            List<labelList> allIds(Pstream::nProcs());
-            allIds[Pstream::myProcNo()] = id;
-            Pstream::gatherList(allIds);
-
-            List<labelList> allOrigProcs(Pstream::nProcs());
-            allOrigProcs[Pstream::myProcNo()] = origProc;
+            Pstream::gatherList(allOrigIds);
             Pstream::gatherList(allOrigProcs);
 
             Info<< "    Constructing tracks" << nl << endl;
@@ -189,7 +166,7 @@ int main(int argc, char *argv[])
                     {
                         label globalId =
                             startIds[allOrigProcs[procI][i]]
-                        + allIds[procI][i];
+                          + allOrigIds[procI][i];
 
                         if (globalId % sampleFrequency == 0)
                         {
@@ -216,7 +193,7 @@ int main(int argc, char *argv[])
     {
         Info<< "\nWriting particle tracks" << nl << endl;
 
-        OFstream vtkTracks("particleTracks.vtk");
+        OFstream vtkTracks(vtkPath/"particleTracks.vtk");
 
         // Total number of points in tracks + 1 per track
         label nPoints = 0;
diff --git a/bin/foamTemplates/sourceTemplate/foamTemplateTemplate.H b/bin/foamTemplates/sourceTemplate/foamTemplateTemplate.H
index fa32697e0a..76bdd55860 100644
--- a/bin/foamTemplates/sourceTemplate/foamTemplateTemplate.H
+++ b/bin/foamTemplates/sourceTemplate/foamTemplateTemplate.H
@@ -129,16 +129,10 @@ public:
 
     // IOstream Operators
 
-        friend Istream& operator>>
-        #ifndef __CINT__
-        <TemplateArgument>
-        #endif
+        friend Istream& operator>> <TemplateArgument>
         (Istream&, ClassName<TemplateArgument>&);
 
-        friend Ostream& operator<<
-        #ifndef __CINT__
-        <TemplateArgument>
-        #endif
+        friend Ostream& operator<< <TemplateArgument>
         (Ostream&, const ClassName<TemplateArgument>&);
 };
 
diff --git a/etc/apps/cint/bashrc b/etc/apps/cint/bashrc
deleted file mode 100644
index dbbd89631e..0000000000
--- a/etc/apps/cint/bashrc
+++ /dev/null
@@ -1,51 +0,0 @@
-#----------------------------------*-sh-*--------------------------------------
-# =========                 |
-# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-#  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
-#    \\/     M anipulation  |
-#------------------------------------------------------------------------------
-# License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software; you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by the
-#     Free Software Foundation; either version 2 of the License, or (at your
-#     option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM; if not, write to the Free Software Foundation,
-#     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-#
-# Script
-#     cint/bashrc
-#
-# Description
-#     Setup file for cint
-#     Sourced from OpenFOAM-*/etc/bashrc
-#
-#------------------------------------------------------------------------------
-
-for CINTSYSDIR in \
-    $HOME/pub/CINT/cint7 \
-    $WM_THIRD_PARTY_DIR/cint-svn/platforms/$WM_OPTIONS \
-    ;
-do
-    if [ -r $CINTSYSDIR ]
-    then
-        export CINTSYSDIR
-        export PATH=$PATH:$CINTSYSDIR/bin
-        export MANPATH=$MANPATH:$CINTSYSDIR/doc
-        export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$CINTSYSDIR/lib
-        break
-    fi
-done
-
-[ -r "$CINTSYSDIR" ] || unset CINTSYSDIR
-
-# -----------------------------------------------------------------------------
diff --git a/etc/apps/cint/cshrc b/etc/apps/cint/cshrc
deleted file mode 100644
index f2c38c481a..0000000000
--- a/etc/apps/cint/cshrc
+++ /dev/null
@@ -1,34 +0,0 @@
-#----------------------------------*-sh-*--------------------------------------
-# =========                 |
-# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-#  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
-#    \\/     M anipulation  |
-#-------------------------------------------------------------------------------
-# License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software; you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by the
-#     Free Software Foundation; either version 2 of the License, or (at your
-#     option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM; if not, write to the Free Software Foundation,
-#     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-#
-# Script
-#     cint/cshrc
-#
-# Description
-#     Setup file for cint
-#     Sourced from OpenFOAM-*/etc/cshrc
-#
-#------------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
diff --git a/etc/bashrc b/etc/bashrc
index edd0265b63..aae664f98a 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -244,7 +244,6 @@ _foamSource $WM_PROJECT_DIR/etc/aliases.sh
 # _foamSource $WM_PROJECT_DIR/etc/apps/paraview/bashrc
 _foamSource $WM_PROJECT_DIR/etc/apps/paraview3/bashrc
 _foamSource $WM_PROJECT_DIR/etc/apps/ensight/bashrc
-_foamSource $WM_PROJECT_DIR/etc/apps/cint/bashrc
 
 
 # Clean environment paths again. Only remove duplicates
diff --git a/etc/cshrc b/etc/cshrc
index 17e75ba888..3e6af0cd44 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -241,7 +241,6 @@ _foamSource $WM_PROJECT_DIR/etc/aliases.csh
 # _foamSource $WM_PROJECT_DIR/etc/apps/paraview/cshrc
 _foamSource $WM_PROJECT_DIR/etc/apps/paraview3/cshrc
 # _foamSource $WM_PROJECT_DIR/etc/apps/ensight/cshrc
-# _foamSource $WM_PROJECT_DIR/etc/apps/cint/cshrc
 
 
 # Clean environment paths again. Only remove duplicates
diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index 63b2ad9a11..24208bfcd5 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -60,10 +60,6 @@ $(sha1)/SHA1Digest.C
 
 primitives/random/Random.C
 
-functions = primitives/functions
-$(functions)/Polynomial/makePolynomialsOrder7.C
-
-
 containers/HashTables/HashTable/HashTableName.C
 containers/HashTables/StaticHashTable/StaticHashTableName.C
 containers/Lists/SortableList/ParSortableListName.C
diff --git a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H
index 8ae3697f1d..78cb735e17 100644
--- a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H
+++ b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H
@@ -122,19 +122,13 @@ public:
 
     // IOstream Operators
 
-        friend Istream& operator>>
-        #ifndef __CINT__
-        <T, Key, Hash>
-        #endif
+        friend Istream& operator>> <T, Key, Hash>
         (
             Istream&,
             HashPtrTable<T, Key, Hash>&
         );
 
-        friend Ostream& operator<<
-        #ifndef __CINT__
-        <T, Key, Hash>
-        #endif
+        friend Ostream& operator<< <T, Key, Hash>
         (
             Ostream&,
             const HashPtrTable<T, Key, Hash>&
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
index 0e13b7c9a1..3871db3a50 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
@@ -417,19 +417,13 @@ public:
 
     // IOstream Operator
 
-        friend Istream& operator>>
-        #ifndef __CINT__
-        <T, Key, Hash>
-        #endif
+        friend Istream& operator>> <T, Key, Hash>
         (
             Istream&,
             HashTable<T, Key, Hash>&
         );
 
-        friend Ostream& operator<<
-        #ifndef __CINT__
-        <T, Key, Hash>
-        #endif
+        friend Ostream& operator<< <T, Key, Hash>
         (
             Ostream&,
             const HashTable<T, Key, Hash>&
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H b/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H
index e2655da433..5212d57f51 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H
@@ -428,20 +428,19 @@ inline bool Foam::HashTable<T, Key, Hash>::const_iterator::operator!=
 
 
 template<class T, class Key, class Hash>
-inline const T& 
+inline const T&
 Foam::HashTable<T, Key, Hash>::const_iterator::operator*() const
 {
     return elmtPtr_->obj_;
 }
 
-#ifndef __CINT__
 template<class T, class Key, class Hash>
 inline const T&
 Foam::HashTable<T, Key, Hash>::const_iterator::operator()() const
 {
     return elmtPtr_->obj_;
 }
-#endif
+
 
 template<class T, class Key, class Hash>
 inline
diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILList.H b/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILList.H
index 2e0823fe3d..20635fa53f 100644
--- a/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILList.H
+++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILList.H
@@ -152,10 +152,7 @@ public:
     // Istream operator
 
         //- Read List from Istream, discarding contents of existing List.
-        friend Istream& operator>>
-        #ifndef __CINT__
-        <LListBase, T>
-        #endif
+        friend Istream& operator>> <LListBase, T>
         (
             Istream&,
             ILList<LListBase, T>&
diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LList.H b/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LList.H
index 9c8a22945a..0905f5543c 100644
--- a/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LList.H
+++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LList.H
@@ -327,19 +327,13 @@ public:
 
     // IOstream operators
 
-        friend Istream& operator>>
-        #ifndef __CINT__
-        <LListBase, T>
-        #endif
+        friend Istream& operator>> <LListBase, T>
         (
             Istream&,
             LList<LListBase, T>&
         );
 
-        friend Ostream& operator<<
-        #ifndef __CINT__
-        <LListBase, T>
-        #endif
+        friend Ostream& operator<< <LListBase, T>
         (
             Ostream&,
             const LList<LListBase, T>&
diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrList.H b/src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrList.H
index ed98956ad5..333d916a65 100644
--- a/src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrList.H
+++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrList.H
@@ -260,19 +260,13 @@ public:
 
     // IOstream operators
 
-        friend Istream& operator>>
-        #ifndef __CINT__
-        <LListBase, T>
-        #endif
+        friend Istream& operator>> <LListBase, T>
         (
             Istream&,
             LPtrList<LListBase, T>&
         );
 
-        friend Ostream& operator<<
-        #ifndef __CINT__
-        <LListBase, T>
-        #endif
+        friend Ostream& operator<< <LListBase, T>
         (
             Ostream&,
             const LPtrList<LListBase, T>&
diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILList.H b/src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILList.H
index feefd60c7c..61585d6ac8 100644
--- a/src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILList.H
+++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILList.H
@@ -277,10 +277,7 @@ public:
 
     // Ostream operator
 
-        friend Ostream& operator<<
-        #ifndef __CINT__
-        <LListBase, T>
-        #endif
+        friend Ostream& operator<< <LListBase, T>
         (
             Ostream&,
             const UILList<LListBase, T>&
diff --git a/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H b/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
index 460d325006..daccd7af3d 100644
--- a/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
+++ b/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
@@ -210,20 +210,14 @@ public:
     // IOstream operators
 
         // Write DynamicList to Ostream.
-        friend Ostream& operator<<
-        #ifndef __CINT__
-        <T, SizeInc, SizeMult, SizeDiv>
-        #endif
+        friend Ostream& operator<< <T, SizeInc, SizeMult, SizeDiv>
         (
             Ostream&,
             const DynamicList<T, SizeInc, SizeMult, SizeDiv>&
         );
 
         //- Read from Istream, discarding contents of existing DynamicList.
-        friend Istream& operator>>
-        #ifndef __CINT__
-        <T, SizeInc, SizeMult, SizeDiv>
-        #endif
+        friend Istream& operator>> <T, SizeInc, SizeMult, SizeDiv>
         (
             Istream&,
             DynamicList<T, SizeInc, SizeMult, SizeDiv>&
diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedList.H b/src/OpenFOAM/containers/Lists/FixedList/FixedList.H
index 6c64a92d03..76f9527701 100644
--- a/src/OpenFOAM/containers/Lists/FixedList/FixedList.H
+++ b/src/OpenFOAM/containers/Lists/FixedList/FixedList.H
@@ -331,17 +331,11 @@ public:
     // IOstream operators
 
         //- Read List from Istream, discarding contents of existing List.
-        friend Istream& operator>>
-        #ifndef __CINT__
-        <T, Size>
-        #endif
+        friend Istream& operator>> <T, Size>
         (Istream&, FixedList<T, Size>&);
 
         // Write FixedList to Ostream.
-        friend Ostream& operator<<
-        #ifndef __CINT__
-        <T, Size>
-        #endif
+        friend Ostream& operator<< <T, Size>
         (
             Ostream&,
             const FixedList<T, Size>&
diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H b/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
index 055f785471..1c3fe7131e 100644
--- a/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
+++ b/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
@@ -398,7 +398,6 @@ inline bool Foam::FixedList<T, Size>::empty() const
 }
 
 
-#ifndef __CINT__
 template<class T, unsigned Size>
 template<class HashT>
 inline unsigned Foam::FixedList<T, Size>::Hash<HashT>::operator()
@@ -426,6 +425,5 @@ inline unsigned Foam::FixedList<T, Size>::Hash<HashT>::operator()
     }
 }
 
-#endif  // __CINT__
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/containers/Lists/List/List.H b/src/OpenFOAM/containers/Lists/List/List.H
index 434320cf5b..a6bf29686a 100644
--- a/src/OpenFOAM/containers/Lists/List/List.H
+++ b/src/OpenFOAM/containers/Lists/List/List.H
@@ -233,10 +233,7 @@ public:
     // Istream operator
 
         //- Read List from Istream, discarding contents of existing List.
-        friend Istream& operator>>
-        #ifndef __CINT__
-        <T>
-        #endif
+        friend Istream& operator>> <T>
         (Istream&, List<T>&);
 };
 
diff --git a/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H b/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H
index ec6a1b9fd6..0219e02af7 100644
--- a/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H
+++ b/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H
@@ -97,16 +97,16 @@ public:
             //- Assignment of all entries to the given value
             inline void operator=(const T&);
 
+
     // Ostream operator
 
         //- Write UIndirectList to Ostream
         //  Binary output is currently still a bit of a problem
-        friend Ostream& operator<<
-        #ifndef __CINT__
-        <T>
-        #endif
-        (Ostream&, const UIndirectList<T>&);
-
+        friend Ostream& operator<< <T>
+        (
+            Ostream&,
+            const UIndirectList<T>&
+        );
 };
 
 
diff --git a/src/OpenFOAM/containers/Lists/UList/UList.H b/src/OpenFOAM/containers/Lists/UList/UList.H
index 6370f8e749..f7db8226ff 100644
--- a/src/OpenFOAM/containers/Lists/UList/UList.H
+++ b/src/OpenFOAM/containers/Lists/UList/UList.H
@@ -313,11 +313,11 @@ public:
     // Ostream operator
 
         // Write UList to Ostream.
-        friend Ostream& operator<<
-        #ifndef __CINT__
-        <T>
-        #endif
-        (Ostream&, const UList<T>&);
+        friend Ostream& operator<< <T>
+        (
+            Ostream&,
+            const UList<T>&
+        );
 };
 
 // Reverse the first n elements of the list
diff --git a/src/OpenFOAM/db/IOobject/IOobject.H b/src/OpenFOAM/db/IOobject/IOobject.H
index 5fc5a839b1..063af46c66 100644
--- a/src/OpenFOAM/db/IOobject/IOobject.H
+++ b/src/OpenFOAM/db/IOobject/IOobject.H
@@ -83,8 +83,6 @@ class objectRegistry;
                            Class IOobject Declaration
 \*---------------------------------------------------------------------------*/
 
-#include "CintDefs.H"
-
 class IOobject
 {
 
@@ -395,7 +393,6 @@ public:
         void operator=(const IOobject&);
 };
 
-#include "CintUndefs.H"
 
 #if defined (__GNUC__)
 template<>
diff --git a/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.H b/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.H
index 29079d33f8..7ad2ebd88a 100644
--- a/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.H
+++ b/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.H
@@ -148,9 +148,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // Global predefined null output stream
 
-#ifndef __CINT__
 extern OFstream Snull;
-#endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.H b/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.H
index f2846f47f5..a9c50741e9 100644
--- a/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.H
+++ b/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.H
@@ -74,8 +74,6 @@ namespace Foam
                            Class IOstream Declaration
 \*---------------------------------------------------------------------------*/
 
-#include "CintDefs.H"
-
 class IOstream
 {
 
@@ -193,9 +191,7 @@ public:
 
 
             //- Ostream operator
-            #ifndef __MAKECINT__
             friend Ostream& operator<<(Ostream& os, const versionNumber& vn);
-            #endif
         };
 
 
@@ -421,7 +417,7 @@ public:
             }
 
             //- Return compression of given compression name
-            static compressionType compressionEnum(const word&); 
+            static compressionType compressionEnum(const word&);
 
             //- Return the stream compression
             compressionType compression() const
@@ -545,7 +541,6 @@ public:
             }
 };
 
-#include "CintUndefs.H"
 
 Ostream& operator<<(Ostream& os, const IOstream::streamFormat& sf);
 Ostream& operator<<(Ostream& os, const IOstream::versionNumber& vn);
@@ -554,7 +549,6 @@ Ostream& operator<<(Ostream& os, const IOstream::versionNumber& vn);
 // --------------------------------------------------------------------
 // ------ Manipulators (not taking arguments)
 // --------------------------------------------------------------------
-#ifndef __CINT__
 
 typedef IOstream& (*IOstreamManip)(IOstream&);
 
@@ -595,8 +589,6 @@ inline IOstream& scientific(IOstream& io)
     return io;
 }
 
-#endif
-
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/InfoProxy.H b/src/OpenFOAM/db/IOstreams/IOstreams/InfoProxy.H
index b4f48ab18f..ff2c1e8a3e 100644
--- a/src/OpenFOAM/db/IOstreams/IOstreams/InfoProxy.H
+++ b/src/OpenFOAM/db/IOstreams/IOstreams/InfoProxy.H
@@ -52,19 +52,14 @@ class InfoProxy
 {
 public:
 
-    #ifndef __MAKECINT__
     const T& t_;
-    #endif
 
     InfoProxy(const T& t)
     :
         t_(t)
     {}
-    
-    friend Ostream& operator<<
-    #ifndef __CINT__
-    <T>
-    #endif
+
+    friend Ostream& operator<< <T>
     (Ostream&, const InfoProxy<T>&);
 };
 
diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/Istream.H b/src/OpenFOAM/db/IOstreams/IOstreams/Istream.H
index f446f2938f..701c674b14 100644
--- a/src/OpenFOAM/db/IOstreams/IOstreams/Istream.H
+++ b/src/OpenFOAM/db/IOstreams/IOstreams/Istream.H
@@ -152,7 +152,6 @@ public:
 // --------------------------------------------------------------------
 // ------ Manipulators (not taking arguments)
 // --------------------------------------------------------------------
-#ifndef __CINT__
 
 typedef Istream& (*IstreamManip)(Istream&);
 
@@ -169,8 +168,6 @@ inline Istream& operator>>(Istream& is, IOstreamManip f)
     return is;
 }
 
-#endif
-
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H b/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H
index f82c796222..6ea3380777 100644
--- a/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H
+++ b/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H
@@ -70,6 +70,7 @@ protected:
         //- Current indent level
         unsigned short indentLevel_;
 
+
 public:
 
     // Constructors
@@ -87,10 +88,9 @@ public:
         {}
 
 
-    // Destructor
-
-        virtual ~Ostream()
-        {}
+    //- Destructor
+    virtual ~Ostream()
+    {}
 
 
     // Member functions
@@ -199,7 +199,6 @@ public:
 // --------------------------------------------------------------------
 // ------ Manipulators (not taking arguments)
 // --------------------------------------------------------------------
-#ifndef __CINT__
 
 typedef Ostream& (*OstreamManip)(Ostream&);
 
@@ -254,8 +253,6 @@ inline Ostream& endl(Ostream& os)
     return os;
 }
 
-#endif
-
 
 // Useful aliases for tab and newline characters
 static const char tab = '\t';
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
index ba7904639c..dff94c259f 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
@@ -151,9 +151,7 @@ public:
 
          // Ostream Operator
 
-            #ifndef __CINT__
             friend Ostream& operator<<(Ostream&, const commsStruct&);
-            #endif
     };
 
 
diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.H b/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.H
index 45dc5a607c..fe778fa010 100644
--- a/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.H
+++ b/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.H
@@ -58,9 +58,7 @@ class ISstream
     // Private data
 
         fileName name_;
-        #ifndef __CINT__
         istream& is_;
-        #endif
 
 
     // Private member functions
diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.H b/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.H
index 75d18ef793..5c862afd93 100644
--- a/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.H
+++ b/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.H
@@ -58,9 +58,7 @@ class OSstream
     // Private data
 
         fileName name_;
-        #ifndef __CINT__
         ostream& os_;
-        #endif
 
 
     // Private Member Functions
diff --git a/src/OpenFOAM/db/IOstreams/Tstreams/ITstream.H b/src/OpenFOAM/db/IOstreams/Tstreams/ITstream.H
index 3a34761db7..891c8f0dab 100644
--- a/src/OpenFOAM/db/IOstreams/Tstreams/ITstream.H
+++ b/src/OpenFOAM/db/IOstreams/Tstreams/ITstream.H
@@ -98,6 +98,12 @@ public:
         }
 
 
+    // Destructor
+
+        virtual ~ITstream()
+        {}
+
+
     // Member functions
 
         // Inquiry
@@ -142,31 +148,31 @@ public:
         // Read functions
 
             //- Return next token from stream
-            Istream& read(token&);
+            virtual Istream& read(token&);
 
             //- Read a character
-            Istream& read(char&);
+            virtual Istream& read(char&);
 
             //- Read a word
-            Istream& read(word&);
+            virtual Istream& read(word&);
 
             // Read a string (including enclosing double-quotes)
-            Istream& read(string&);
+            virtual Istream& read(string&);
 
             //- Read a label
-            Istream& read(label&);
+            virtual Istream& read(label&);
 
             //- Read a floatScalar
-            Istream& read(floatScalar&);
+            virtual Istream& read(floatScalar&);
 
             //- Read a doubleScalar
-            Istream& read(doubleScalar&);
+            virtual Istream& read(doubleScalar&);
 
             //- Read binary block
-            Istream& read(char*, std::streamsize);
+            virtual Istream& read(char*, std::streamsize);
 
             //- Rewind and return the stream so that it may be read again
-            Istream& rewind();
+            virtual Istream& rewind();
 
 
         // Edit
diff --git a/src/OpenFOAM/db/IOstreams/token/token.H b/src/OpenFOAM/db/IOstreams/token/token.H
index 2defc09d73..0880b13d13 100644
--- a/src/OpenFOAM/db/IOstreams/token/token.H
+++ b/src/OpenFOAM/db/IOstreams/token/token.H
@@ -66,8 +66,6 @@ Ostream& operator<<(Ostream&, const token&);
                            Class token Declaration
 \*---------------------------------------------------------------------------*/
 
-#include "CintDefs.H"
-
 class token
 {
 
@@ -206,9 +204,7 @@ public:
 
         // IOstream Operators
 
-            #ifndef __MAKECINT__
             friend Ostream& operator<<(Ostream&, const compound&);
-            #endif
     };
 
 
@@ -431,7 +427,6 @@ public:
         friend ostream& operator<<(ostream&, const InfoProxy<token>&);
 };
 
-#include "CintUndefs.H"
 
 Ostream& operator<<(Ostream&, const token::punctuationToken&);
 ostream& operator<<(ostream&, const token::punctuationToken&);
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.H b/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.H
index e4255827bf..6fc94aa1ad 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.H
+++ b/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.H
@@ -80,7 +80,7 @@ class includeEntry
 public:
 
     //- Runtime type information
-    TypeName("include");
+    ClassName("include");
 
 
     // Member Functions
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/inputModeEntry/inputModeEntry.H b/src/OpenFOAM/db/dictionary/functionEntries/inputModeEntry/inputModeEntry.H
index da3bd7a067..4aace67dfa 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/inputModeEntry/inputModeEntry.H
+++ b/src/OpenFOAM/db/dictionary/functionEntries/inputModeEntry/inputModeEntry.H
@@ -96,7 +96,7 @@ class inputModeEntry
 public:
 
     //- Runtime type information
-    TypeName("inputMode");
+    ClassName("inputMode");
 
 
     // Member Functions
@@ -118,7 +118,6 @@ public:
 
         //- Return true if the inputMode is %error
         static bool error();
-
 };
 
 
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/removeEntry/removeEntry.H b/src/OpenFOAM/db/dictionary/functionEntries/removeEntry/removeEntry.H
index 1ed2d99639..b98da86e67 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/removeEntry/removeEntry.H
+++ b/src/OpenFOAM/db/dictionary/functionEntries/removeEntry/removeEntry.H
@@ -74,7 +74,7 @@ class removeEntry
 public:
 
     //- Runtime type information
-    TypeName("remove");
+    ClassName("remove");
 
 
     // Member Functions
diff --git a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H
index c5189c1520..afc3912483 100644
--- a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H
+++ b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H
@@ -66,9 +66,6 @@ class primitiveEntry
     public entry,
     public ITstream
 {
-
-public:
-
     // Private member functions
 
         //- Append the given token to this entry
@@ -93,9 +90,6 @@ public:
             Istream&
         );
 
-        //- Read tokens from the given stream
-        bool read(const dictionary&, Istream&);
-
         //- Read the complete entry from the given stream
         void readEntry(const dictionary&, Istream&);
 
@@ -169,6 +163,9 @@ public:
         //  calling this function generates a FatalError
         dictionary& dict();
 
+        //- Read tokens from the given stream
+        bool read(const dictionary&, Istream&);
+
         // Write
         void write(Ostream&) const;
 
diff --git a/src/OpenFOAM/db/error/error.H b/src/OpenFOAM/db/error/error.H
index 1cd9574e6d..639bd933c6 100644
--- a/src/OpenFOAM/db/error/error.H
+++ b/src/OpenFOAM/db/error/error.H
@@ -150,12 +150,9 @@ public:
 
         //- Convert to Ostream
         //  Prints basic message and then returns Ostream for further info.
-        #ifndef __CINT__
         operator OSstream&();
-        #endif
 
         //- Explicitly convert to Ostream for << operations
-        //  needed in cint
         OSstream& operator()()
         {
             return operator OSstream&();
@@ -311,9 +308,7 @@ extern IOerror FatalIOError;
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#ifndef __CINT__
 #include "errorManip.H"
-#endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/db/error/messageStream.H b/src/OpenFOAM/db/error/messageStream.H
index 20b0436327..d37f6a010c 100644
--- a/src/OpenFOAM/db/error/messageStream.H
+++ b/src/OpenFOAM/db/error/messageStream.H
@@ -182,12 +182,9 @@ public:
         );
 
         //- Convert to Ostream for << operations
-        #ifndef __CINT__
         operator OSstream&();
-        #endif
 
         //- Explicitly convert to Ostream for << operations
-        //  needed in cint
         OSstream& operator()()
         {
             return operator OSstream&();
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
index 1ad252955a..6817098a6c 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
@@ -174,16 +174,10 @@ public:
 
     // IOstream operators
 
-        friend Istream& operator>>
-        #ifndef __CINT__
-        <Type>
-        #endif
+        friend Istream& operator>> <Type>
         (Istream&, dimensioned<Type>&);
 
-        friend Ostream& operator<<
-        #ifndef __CINT__
-        <Type>
-        #endif
+        friend Ostream& operator<< <Type>
         (Ostream&, const dimensioned<Type>&);
 };
 
diff --git a/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H b/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H
index 79c9cd4bae..1b9915d573 100644
--- a/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H
+++ b/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H
@@ -62,12 +62,10 @@ Istream& operator>>(Istream&, DynamicField<Type>&);
                            Class DynamicField Declaration
 \*---------------------------------------------------------------------------*/
 
-#include "CintDefs.H"
-
 template<class Type>
 class DynamicField
 :
-    public Field<Type>     //private Field<Type>
+    public Field<Type>
 {
 
     // Private data
@@ -185,26 +183,16 @@ public:
 
     // IOstream operators
 
-        friend Ostream& operator<<
-        #ifndef __CINT__
-        <Type>
-        #endif
+        friend Ostream& operator<< <Type>
         (Ostream&, const DynamicField<Type>&);
 
-        friend Ostream& operator<<
-        #ifndef __CINT__
-        <Type>
-        #endif
+        friend Ostream& operator<< <Type>
         (Ostream&, const tmp<DynamicField<Type> >&);
 
-        friend Istream& operator>>
-        #ifndef __CINT__
-        <Type>
-        #endif
+        friend Istream& operator>> <Type>
         (Istream&, DynamicField<Type>&);
 };
 
-#include "CintUndefs.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.H b/src/OpenFOAM/fields/Fields/Field/Field.H
index e56e463371..98e664ec8d 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.H
+++ b/src/OpenFOAM/fields/Fields/Field/Field.H
@@ -75,8 +75,6 @@ class dictionary;
                            Class Field Declaration
 \*---------------------------------------------------------------------------*/
 
-#include "CintDefs.H"
-
 template<class Type>
 class Field
 :
@@ -198,13 +196,11 @@ public:
 
         //- Return a pointer to a new calculatedFvPatchFieldField created on
         //  freestore without setting patchField values
-        #ifndef __CINT__
         template<class Type2>
         static tmp<Field<Type> > NewCalculatedType(const Field<Type2>& f)
         {
             return tmp<Field<Type> >(new Field<Type>(f.size()));
         }
-        #endif
 
 
     // Member Functions
@@ -343,20 +339,13 @@ public:
 
     // IOstream operators
 
-        friend Ostream& operator<<
-        #ifndef __CINT__
-        <Type>
-        #endif
+        friend Ostream& operator<< <Type>
         (Ostream&, const Field<Type>&);
 
-        friend Ostream& operator<<
-        #ifndef __CINT__
-        <Type>
-        #endif
+        friend Ostream& operator<< <Type>
         (Ostream&, const tmp<Field<Type> >&);
 };
 
-#include "CintUndefs.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/fields/cloud/cloud.H b/src/OpenFOAM/fields/cloud/cloud.H
index 0c0915464e..d48e5dffbb 100644
--- a/src/OpenFOAM/fields/cloud/cloud.H
+++ b/src/OpenFOAM/fields/cloud/cloud.H
@@ -75,15 +75,15 @@ public:
         //- The default cloud name: %defaultCloud
         static word defaultName;
 
+
     // Constructors
 
         //- Construct for the given objectRegistry and named cloud instance
         cloud(const objectRegistry&, const word& cloudName = "");
 
 
-    // Destructor
-
-        virtual ~cloud();
+    //- Destructor
+    virtual ~cloud();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/include/CintDefs.H b/src/OpenFOAM/include/CintDefs.H
deleted file mode 100644
index 90e1f62a2f..0000000000
--- a/src/OpenFOAM/include/CintDefs.H
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifdef __CINT__
-# define tmp Foam::tmp
-# define UList Foam::UList
-# define List Foam::List
-# define InfoProxy Foam::InfoProxy
-#endif
diff --git a/src/OpenFOAM/include/CintUndefs.H b/src/OpenFOAM/include/CintUndefs.H
deleted file mode 100644
index 6b0b69e99c..0000000000
--- a/src/OpenFOAM/include/CintUndefs.H
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifdef __CINT__
-# undef tmp
-# undef UList
-# undef List
-# undef InfoProxy
-#endif
diff --git a/src/OpenFOAM/meshes/primitiveShapes/line/line.H b/src/OpenFOAM/meshes/primitiveShapes/line/line.H
index 8af00d5bf9..e9f7c0296f 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/line/line.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/line/line.H
@@ -124,19 +124,13 @@ public:
 
     // Ostream operator
 
-        friend Istream& operator>>
-        #ifndef __CINT__
-        <Point, PointRef>
-        #endif
+        friend Istream& operator>> <Point, PointRef>
         (
             Istream&,
             line&
         );
 
-        friend Ostream& operator<<
-        #ifndef __CINT__
-        <Point, PointRef>
-        #endif
+        friend Ostream& operator<< <Point, PointRef>
         (
             Ostream&,
             const line&
diff --git a/src/OpenFOAM/meshes/primitiveShapes/objectHit/PointHit.H b/src/OpenFOAM/meshes/primitiveShapes/objectHit/PointHit.H
index 8ae9afc7f2..375978a0b2 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/objectHit/PointHit.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/objectHit/PointHit.H
@@ -184,10 +184,7 @@ public:
 
     // Ostream operator
 
-        friend Ostream& operator<<
-        #ifndef __CINT__
-        <Point>
-        #endif
+        friend Ostream& operator<< <Point>
         (
             Ostream& os,
             const PointHit<Point>& b
@@ -202,7 +199,7 @@ inline Ostream& operator<<(Ostream& os, const PointHit<Point>& b)
         << b.rawPoint() << token::SPACE
         << b.distance() << token::SPACE
         << b.eligibleMiss();
-    
+
     return os;
 }
 
diff --git a/src/OpenFOAM/primitives/SphericalTensor/SphericalTensorI.H b/src/OpenFOAM/primitives/SphericalTensor/SphericalTensorI.H
index 28b7b8b9d3..0459aedecf 100644
--- a/src/OpenFOAM/primitives/SphericalTensor/SphericalTensorI.H
+++ b/src/OpenFOAM/primitives/SphericalTensor/SphericalTensorI.H
@@ -181,7 +181,7 @@ inline Cmpt det(const SphericalTensor<Cmpt>& st)
 template <class Cmpt>
 inline SphericalTensor<Cmpt> inv(const SphericalTensor<Cmpt>& st)
 {
-    return SphericalTensor<Cmpt>(1.0/st.ii()); 
+    return SphericalTensor<Cmpt>(1.0/st.ii());
 }
 
 
@@ -202,7 +202,6 @@ public:
 };
 
 
-#ifndef __CINT__
 template<class Cmpt>
 class innerProduct<SphericalTensor<Cmpt>, SphericalTensor<Cmpt> >
 {
@@ -227,7 +226,6 @@ public:
 
     typedef Vector<Cmpt> type;
 };
-#endif
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H b/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H
index 5a2de5dbbd..3078f941e6 100644
--- a/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H
+++ b/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H
@@ -520,7 +520,6 @@ public:
     typedef SymmTensor<Cmpt> type;
 };
 
-#ifndef __CINT__
 template<class Cmpt>
 class innerProduct<SymmTensor<Cmpt>, SymmTensor<Cmpt> >
 {
@@ -529,7 +528,6 @@ public:
     typedef SymmTensor<Cmpt> type;
 };
 
-
 template<class Cmpt>
 class innerProduct<SymmTensor<Cmpt>, Vector<Cmpt> >
 {
@@ -578,7 +576,7 @@ public:
 
     typedef SymmTensor<Cmpt> type;
 };
-#endif
+
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/primitives/Tensor/TensorI.H b/src/OpenFOAM/primitives/Tensor/TensorI.H
index 7ca9958aa1..71e7c0c767 100644
--- a/src/OpenFOAM/primitives/Tensor/TensorI.H
+++ b/src/OpenFOAM/primitives/Tensor/TensorI.H
@@ -647,7 +647,6 @@ operator&&(const Tensor<Cmpt>& t1, const SphericalTensor<Cmpt>& st2)
     return(t1.xx()*st2.ii() + t1.yy()*st2.ii() + t1.zz()*st2.ii());
 }
 
-#ifndef __CINT__
 template<class Cmpt>
 class typeOfSum<SphericalTensor<Cmpt>, Tensor<Cmpt> >
 {
@@ -679,7 +678,7 @@ public:
 
     typedef Tensor<Cmpt> type;
 };
-#endif
+
 
 // * * * * * * * * * * Mixed Tensor SymmTensor Operators * * * * * * * * * * //
 
@@ -806,7 +805,6 @@ operator&&(const Tensor<Cmpt>& t1, const SymmTensor<Cmpt>& st2)
     );
 }
 
-#ifndef __CINT__
 template<class Cmpt>
 class typeOfSum<SymmTensor<Cmpt>, Tensor<Cmpt> >
 {
@@ -839,7 +837,6 @@ public:
 
     typedef Tensor<Cmpt> type;
 };
-#endif
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/Tuple2/Tuple2.H b/src/OpenFOAM/primitives/Tuple2/Tuple2.H
index 9a850e6236..cac4595872 100644
--- a/src/OpenFOAM/primitives/Tuple2/Tuple2.H
+++ b/src/OpenFOAM/primitives/Tuple2/Tuple2.H
@@ -139,19 +139,13 @@ public:
 
     // Friend Operators
 
-        friend bool operator==
-        #ifndef __CINT__
-        <Type1, Type2>
-        #endif
+        friend bool operator== <Type1, Type2>
         (
             const Tuple2<Type1, Type2>& a,
             const Tuple2<Type1, Type2>& b
         );
 
-        friend bool operator!=
-        #ifndef __CINT__
-        <Type1, Type2>
-        #endif
+        friend bool operator!= <Type1, Type2>
         (
             const Tuple2<Type1, Type2>& a,
             const Tuple2<Type1, Type2>& b
@@ -161,20 +155,14 @@ public:
     // IOstream operators
 
         //- Read Tuple2 from Istream, discarding contents of existing Tuple2.
-        friend Istream& operator>>
-        #ifndef __CINT__
-        <Type1, Type2>
-        #endif
+        friend Istream& operator>> <Type1, Type2>
         (
             Istream& is,
             Tuple2<Type1, Type2>& t2
         );
 
         // Write Tuple2 to Ostream.
-        friend Ostream& operator<<
-        #ifndef __CINT__
-        <Type1, Type2>
-        #endif
+        friend Ostream& operator<< <Type1, Type2>
         (
             Ostream& os,
             const Tuple2<Type1, Type2>& t2
diff --git a/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H b/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H
index dda9bd2804..31e5b84f4a 100644
--- a/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H
+++ b/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H
@@ -136,19 +136,13 @@ public:
 
     // IOstream Operators
 
-        friend Istream& operator>>
-        #ifndef __CINT__
-        <Form, Cmpt, nCmpt>
-        #endif
+        friend Istream& operator>> <Form, Cmpt, nCmpt>
         (
             Istream&,
             VectorSpace<Form, Cmpt, nCmpt>&
         );
 
-        friend Ostream& operator<<
-        #ifndef __CINT__
-        <Form, Cmpt, nCmpt>
-        #endif
+        friend Ostream& operator<< <Form, Cmpt, nCmpt>
         (
             Ostream&,
             const VectorSpace<Form, Cmpt, nCmpt>&
diff --git a/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H b/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H
index f368c6b8ae..eeea5f6bff 100644
--- a/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H
+++ b/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H
@@ -263,7 +263,6 @@ inline const Cmpt& component
 
 // Powers of a Form
 // Equivalent to outer-products between the Form and itself
-#ifndef __CINT__
 // Form^0 = 1.0
 template<class Form, class Cmpt, int nCmpt>
 inline typename powProduct<Form, 0>::type pow
@@ -300,7 +299,7 @@ inline typename powProduct<Form, 2>::type pow
 {
     return sqr(static_cast<const Form&>(v));
 }
-#endif
+
 
 template<class Form, class Cmpt, int nCmpt>
 inline scalar magSqr
@@ -515,7 +514,6 @@ inline Form operator+
     return v;
 }
 
-
 template<class Form, class Cmpt, int nCmpt>
 inline Form operator-
 (
diff --git a/src/OpenFOAM/primitives/VectorSpace/products.H b/src/OpenFOAM/primitives/VectorSpace/products.H
index d91790f02c..64647f7146 100644
--- a/src/OpenFOAM/primitives/VectorSpace/products.H
+++ b/src/OpenFOAM/primitives/VectorSpace/products.H
@@ -61,8 +61,6 @@ public:
 };
 
 
-#ifndef __CINT__
-
 template<class arg1, class arg2>
 class outerProduct
 {
@@ -121,52 +119,6 @@ public:
     >::type type;
 };
 
-#else
-
-template<class arg1, class arg2>
-class outerProduct
-{
-public:
-
-    typedef arg1 type;
-};
-
-
-template<class arg1, class arg2>
-class crossProduct
-{
-public:
-
-    typedef arg1 type;
-};
-
-template<class arg1, class arg2>
-class innerProduct
-{
-public:
-
-    typedef arg1 type;
-};
-
-template<class arg1, class arg2>
-class scalarProduct
-{
-public:
-
-    typedef typename pTraits<arg1>::cmptType type;
-};
-
-
-template<class arg1, int arg2>
-class powProduct
-{
-public:
-
-    typedef arg1 type;
-};
-
-#endif
-
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.C b/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.C
index b842493eef..8f3381ea45 100644
--- a/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.C
+++ b/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.C
@@ -69,16 +69,6 @@ Foam::Polynomial<PolySize>::Polynomial(const word& name, Istream& is)
 }
 
 
-template<int PolySize>
-Foam::Polynomial<PolySize>::Polynomial(const Polynomial<PolySize>& poly)
-:
-    VectorSpace<Polynomial<PolySize>, scalar, PolySize>(poly),
-    name_(poly.name_),
-    logActive_(poly.logActive_),
-    logCoeff_(poly.logCoeff_)
-{}
-
-
 template<int PolySize>
 Foam::Polynomial<PolySize>::Polynomial
 (
@@ -93,13 +83,6 @@ Foam::Polynomial<PolySize>::Polynomial
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-template<int PolySize>
-Foam::Polynomial<PolySize>::~Polynomial()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<int PolySize>
@@ -210,16 +193,4 @@ Foam::Polynomial<PolySize>::integrateMinus1(const scalar intConstant)
 }
 
 
-// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
-
-template<int PolySize>
-void Foam::Polynomial<PolySize>::operator=(const Polynomial<PolySize>& poly)
-{
-    name_ = poly.name_;
-    VectorSpace<Polynomial<PolySize>, scalar, PolySize>::operator=(poly);
-    logActive_ = poly.logActive_;
-    logCoeff_ = poly.logCoeff_;
-}
-
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H b/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H
index 89ecb9c184..c1e2b58009 100644
--- a/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H
+++ b/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H
@@ -52,7 +52,6 @@ SourceFiles
 #include "scalar.H"
 #include "Ostream.H"
 #include "VectorSpace.H"
-#include "Vector.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -81,8 +80,6 @@ class Polynomial
 :
     public VectorSpace<Polynomial<PolySize>, scalar, PolySize>
 {
-private:
-
     // Private data
 
         //- Polynomial name
@@ -101,9 +98,6 @@ public:
 
     typedef Polynomial<PolySize+1> intPolyType;
 
-    //- Run-time type information
-    TypeName("Polynomial")
-
 
     // Constructors
 
@@ -113,17 +107,10 @@ public:
         //- Construct from name and Istream
         Polynomial(const word& name, Istream& is);
 
-        //- Copy constructor
-        Polynomial(const Polynomial& poly);
-
         //- Copy constructor with name
         Polynomial(const word& name, const Polynomial& poly);
 
 
-    //- Destructor
-    ~Polynomial();
-
-
     // Member Functions
 
         // Access
@@ -155,11 +142,6 @@ public:
             scalar integrateLimits(const scalar x1, const scalar x2) const;
 
 
-    // Member operators
-
-        void operator=(const Polynomial& poly);
-
-
     //- Ostream Operator
     friend Ostream& operator<< <PolySize>
     (
@@ -175,17 +157,6 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makePolynomial(PolySize)                                             \
-                                                                             \
-defineTemplateTypeNameAndDebugWithName                                       \
-(                                                                            \
-    Polynomial<PolySize>,                                                    \
-    "Polynomial<"#PolySize">",                                               \
-    0                                                                        \
-)
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 #ifdef NoRepository
 #   include "Polynomial.C"
 #   include "PolynomialIO.C"
diff --git a/src/OpenFOAM/primitives/functions/Polynomial/makePolynomialsOrder7.C b/src/OpenFOAM/primitives/functions/Polynomial/makePolynomialsOrder7.C
deleted file mode 100644
index ae8f43fb5c..0000000000
--- a/src/OpenFOAM/primitives/functions/Polynomial/makePolynomialsOrder7.C
+++ /dev/null
@@ -1,51 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-#include "Polynomial.H"
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    makePolynomial(2);
-    makePolynomial(3);
-    makePolynomial(4);
-    makePolynomial(5);
-    makePolynomial(6);
-    makePolynomial(7);
-    makePolynomial(8);
-
-    // explicitly define max order + 1 to define the integrated form
-    defineTemplateTypeNameAndDebugWithName
-    (
-        Polynomial<9>,
-        "Polynomial<9>",
-        0
-    );
-}
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/basic/IOPosition/IOPosition.C b/src/lagrangian/basic/IOPosition/IOPosition.C
index 7865a12105..810a9fbcf5 100644
--- a/src/lagrangian/basic/IOPosition/IOPosition.C
+++ b/src/lagrangian/basic/IOPosition/IOPosition.C
@@ -22,12 +22,77 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "IOPosition.H"
 
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+template<class ParticleType>
+Foam::word Foam::IOPosition<ParticleType>::particlePropertiesName
+(
+    "particleProperties"
+);
+
+// * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * * //
+
+template<class ParticleType>
+void Foam::IOPosition<ParticleType>::readParticleProperties()
+{
+    IOobject propsDictHeader
+    (
+        particlePropertiesName,
+        cloud_.db().time().timeName(),
+        "uniform"/cloud::prefix/cloud_.name(),
+        cloud_.db(),
+        IOobject::MUST_READ,
+        IOobject::NO_WRITE,
+        false
+    );
+
+    if (propsDictHeader.headerOk())
+    {
+        const IOdictionary propsDict(propsDictHeader);
+
+        word procName("processor" + Foam::name(Pstream::myProcNo()));
+        if (propsDict.found(procName))
+        {
+            propsDict.subDict(procName).lookup("particleCount")
+                >> Particle<ParticleType>::particleCount;
+        }
+    }
+}
+
+
+template<class ParticleType>
+void Foam::IOPosition<ParticleType>::writeParticleProperties() const
+{
+    IOdictionary propsDict
+    (
+        IOobject
+        (
+            particlePropertiesName,
+            cloud_.db().time().timeName(),
+            "uniform"/cloud::prefix/cloud_.name(),
+            cloud_.db(),
+            IOobject::NO_READ,
+            IOobject::NO_WRITE,
+            false
+        )
+    );
+
+    word procName("processor" + Foam::name(Pstream::myProcNo()));
+    propsDict.add(procName, dictionary());
+    propsDict.subDict(procName).add
+    (
+        "particleCount",
+        Particle<ParticleType>::particleCount
+    );
+
+    propsDict.regIOobject::write();
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class ParticleType>
@@ -70,6 +135,8 @@ bool Foam::IOPosition<ParticleType>::write() const
 template<class ParticleType>
 bool Foam::IOPosition<ParticleType>::writeData(Ostream& os) const
 {
+    writeParticleProperties();
+
     os<< cloud_.size() << nl << token::BEGIN_LIST << nl;
 
     forAllConstIter(typename Cloud<ParticleType>, cloud_, iter)
@@ -90,6 +157,8 @@ void Foam::IOPosition<ParticleType>::readData
     bool checkClass
 )
 {
+    readParticleProperties();
+
     Istream& is = readStream(checkClass ? typeName : "");
 
     token firstToken(is);
diff --git a/src/lagrangian/basic/IOPosition/IOPosition.H b/src/lagrangian/basic/IOPosition/IOPosition.H
index 5123644385..069dc0135d 100644
--- a/src/lagrangian/basic/IOPosition/IOPosition.H
+++ b/src/lagrangian/basic/IOPosition/IOPosition.H
@@ -59,30 +59,38 @@ class IOPosition
         const Cloud<ParticleType>& cloud_;
 
 
+    // Private member functions
+
+        //- Read particle properties dictionary
+        void readParticleProperties();
+
+        //- Write particle properties dictionary
+        void writeParticleProperties() const;
+
+
 public:
 
-    //- Runtime type name information
-    virtual const word& type() const
-    {
-        return cloud_.type();
-    }
+    // Static data
+
+        //- Runtime type name information
+        virtual const word& type() const
+        {
+            return cloud_.type();
+        }
+
+        //- Name of particle properties dictionary
+        static word particlePropertiesName;
+
 
     // Constructors
 
         //- Construct from cloud
-        IOPosition
-        (
-            const Cloud<ParticleType>&
-        );
+        IOPosition(const Cloud<ParticleType>&);
 
 
     // Member functions
 
-        void readData
-        (
-            Cloud<ParticleType>& c,
-            bool checkClass
-        );
+        void readData(Cloud<ParticleType>& c, bool checkClass);
 
         bool write() const;
 
diff --git a/src/lagrangian/basic/Particle/Particle.C b/src/lagrangian/basic/Particle/Particle.C
index ee85abda68..4b51b88a45 100644
--- a/src/lagrangian/basic/Particle/Particle.C
+++ b/src/lagrangian/basic/Particle/Particle.C
@@ -33,6 +33,12 @@ License
 #include "wallPolyPatch.H"
 #include "transform.H"
 
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+template<class ParticleType>
+Foam::label Foam::Particle<ParticleType>::particleCount = 0;
+
+
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class ParticleType>
@@ -69,7 +75,7 @@ void Foam::Particle<ParticleType>::findFaces
     DynamicList<label>& faceList
 ) const
 {
-    const polyMesh& mesh = cloud_.polyMesh_;
+    const polyMesh& mesh = cloud_.mesh();
     const labelList& faces = mesh.cells()[celli];
     const vector& C = mesh.cellCentres()[celli];
 
@@ -176,7 +182,9 @@ Foam::Particle<ParticleType>::Particle
     position_(position),
     celli_(celli),
     facei_(-1),
-    stepFraction_(0.0)
+    stepFraction_(0.0),
+    origProc_(Pstream::myProcNo()),
+    origId_(particleCount++)
 {}
 
 
@@ -187,7 +195,9 @@ Foam::Particle<ParticleType>::Particle(const Particle<ParticleType>& p)
     position_(p.position_),
     celli_(p.celli_),
     facei_(p.facei_),
-    stepFraction_(p.stepFraction_)
+    stepFraction_(p.stepFraction_),
+    origProc_(p.origProc_),
+    origId_(p.origId_)
 {}
 
 
diff --git a/src/lagrangian/basic/Particle/Particle.H b/src/lagrangian/basic/Particle/Particle.H
index f061c06b68..71011d72a4 100644
--- a/src/lagrangian/basic/Particle/Particle.H
+++ b/src/lagrangian/basic/Particle/Particle.H
@@ -127,6 +127,12 @@ protected:
         //- Fraction of time-step completed
         scalar stepFraction_;
 
+        //- Originating processor id
+        label origProc_;
+
+        //- Local particle id on originating processor
+        label origId_;
+
 
     // Private member functions
 
@@ -267,11 +273,14 @@ public:
 
     // Static data members
 
+        //- Runtime type information
+        TypeName("Particle");
+
         //- String representation of properties
         static string propHeader;
 
-        //- Runtime type information
-        TypeName("Particle");
+        //- Cumulative particle count used for particle id
+        static label particleCount;
 
 
     // Constructors
@@ -396,6 +405,12 @@ public:
             //-  Return the fraction of time-step completed
             inline scalar stepFraction() const;
 
+            //- Return the originating processor id
+            inline label origProc() const;
+
+            //- Return the particle id on originating processor
+            inline label origId() const;
+
 
         // Track
 
diff --git a/src/lagrangian/basic/Particle/ParticleI.H b/src/lagrangian/basic/Particle/ParticleI.H
index 0eb8912717..65ac64e525 100644
--- a/src/lagrangian/basic/Particle/ParticleI.H
+++ b/src/lagrangian/basic/Particle/ParticleI.H
@@ -26,15 +26,10 @@ License
 
 #include "polyMesh.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class ParticleType>
-inline scalar Particle<ParticleType>::lambda
+inline Foam::scalar Foam::Particle<ParticleType>::lambda
 (
     const vector& from,
     const vector& to,
@@ -182,7 +177,7 @@ inline scalar Particle<ParticleType>::lambda
 
 
 template<class ParticleType>
-inline scalar Particle<ParticleType>::lambda
+inline Foam::scalar Foam::Particle<ParticleType>::lambda
 (
     const vector& from,
     const vector& to,
@@ -234,7 +229,7 @@ inline scalar Particle<ParticleType>::lambda
 
 
 template<class ParticleType>
-inline bool Particle<ParticleType>::inCell() const
+inline bool Foam::Particle<ParticleType>::inCell() const
 {
     DynamicList<label>& faces = cloud_.labels_;
     findFaces(position_, faces);
@@ -244,7 +239,7 @@ inline bool Particle<ParticleType>::inCell() const
 
 
 template<class ParticleType>
-inline bool Particle<ParticleType>::inCell
+inline bool Foam::Particle<ParticleType>::inCell
 (
     const vector& position,
     const label celli,
@@ -261,7 +256,7 @@ inline bool Particle<ParticleType>::inCell
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class ParticleType>
-inline Particle<ParticleType>::trackData::trackData
+inline Foam::Particle<ParticleType>::trackData::trackData
 (
     Cloud<ParticleType>& cloud
 )
@@ -269,8 +264,10 @@ inline Particle<ParticleType>::trackData::trackData
     cloud_(cloud)
 {}
 
+
 template<class ParticleType>
-inline Cloud<ParticleType>& Particle<ParticleType>::trackData::cloud()
+inline Foam::Cloud<ParticleType>&
+Foam::Particle<ParticleType>::trackData::cloud()
 {
     return cloud_;
 }
@@ -279,76 +276,92 @@ inline Cloud<ParticleType>& Particle<ParticleType>::trackData::cloud()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class ParticleType>
-inline const Cloud<ParticleType>& Particle<ParticleType>::cloud() const
+inline const Foam::Cloud<ParticleType>&
+Foam::Particle<ParticleType>::cloud() const
 {
     return cloud_;
 }
 
 
 template<class ParticleType>
-inline const vector& Particle<ParticleType>::position() const
+inline const Foam::vector& Foam::Particle<ParticleType>::position() const
 {
     return position_;
 }
 
 
 template<class ParticleType>
-inline vector& Particle<ParticleType>::position()
+inline Foam::vector& Foam::Particle<ParticleType>::position()
 {
     return position_;
 }
 
 
 template<class ParticleType>
-inline label Particle<ParticleType>::cell() const
-{
-    return celli_;
-}
-
-template<class ParticleType>
-inline label& Particle<ParticleType>::cell()
+inline Foam::label Foam::Particle<ParticleType>::cell() const
 {
     return celli_;
 }
 
 
 template<class ParticleType>
-inline label Particle<ParticleType>::face() const
+inline Foam::label& Foam::Particle<ParticleType>::cell()
+{
+    return celli_;
+}
+
+
+template<class ParticleType>
+inline Foam::label Foam::Particle<ParticleType>::face() const
 {
     return facei_;
 }
 
 
 template<class ParticleType>
-inline bool Particle<ParticleType>::onBoundary() const
+inline bool Foam::Particle<ParticleType>::onBoundary() const
 {
     return facei_ != -1 && facei_ >= cloud_.pMesh().nInternalFaces();
 }
 
 
 template<class ParticleType>
-inline scalar& Particle<ParticleType>::stepFraction()
+inline Foam::scalar& Foam::Particle<ParticleType>::stepFraction()
 {
     return stepFraction_;
 }
 
 
 template<class ParticleType>
-inline scalar Particle<ParticleType>::stepFraction() const
+inline Foam::scalar Foam::Particle<ParticleType>::stepFraction() const
 {
     return stepFraction_;
 }
 
 
 template<class ParticleType>
-inline bool Particle<ParticleType>::softImpact() const
+inline Foam::label Foam::Particle<ParticleType>::origProc() const
+{
+    return origProc_;
+}
+
+
+template<class ParticleType>
+inline Foam::label Foam::Particle<ParticleType>::origId() const
+{
+    return origId_;
+}
+
+
+template<class ParticleType>
+inline bool Foam::Particle<ParticleType>::softImpact() const
 {
     return false;
 }
 
 
 template<class ParticleType>
-inline scalar Particle<ParticleType>::currentTime() const
+inline Foam::scalar Foam::Particle<ParticleType>::currentTime() const
 {
     return
         cloud_.pMesh().time().value()
@@ -357,14 +370,14 @@ inline scalar Particle<ParticleType>::currentTime() const
 
 
 template<class ParticleType>
-inline label Particle<ParticleType>::patch(const label facei) const
+inline Foam::label Foam::Particle<ParticleType>::patch(const label facei) const
 {
     return cloud_.facePatch(facei);
 }
 
 
 template<class ParticleType>
-inline label Particle<ParticleType>::patchFace
+inline Foam::label Foam::Particle<ParticleType>::patchFace
 (
     const label patchi,
     const label facei
@@ -375,21 +388,18 @@ inline label Particle<ParticleType>::patchFace
 
 
 template<class ParticleType>
-inline scalar Particle<ParticleType>::wallImpactDistance(const vector&) const
+inline Foam::scalar
+Foam::Particle<ParticleType>::wallImpactDistance(const vector&) const
 {
     return 0.0;
 }
 
 
 template<class ParticleType>
-inline label Particle<ParticleType>::faceInterpolation() const
+inline Foam::label Foam::Particle<ParticleType>::faceInterpolation() const
 {
     return facei_;
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/lagrangian/basic/Particle/ParticleIO.C b/src/lagrangian/basic/Particle/ParticleIO.C
index 70e635dc94..5865cf5098 100644
--- a/src/lagrangian/basic/Particle/ParticleIO.C
+++ b/src/lagrangian/basic/Particle/ParticleIO.C
@@ -31,12 +31,11 @@ License
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 template<class ParticleType>
-Foam::string Foam::Particle<ParticleType>::propHeader = "(Px Py Pz) cellI";
-
+Foam::string Foam::Particle<ParticleType>::propHeader =
+    "(Px Py Pz) cellI origProc origId";
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from Istream
 template<class ParticleType>
 Foam::Particle<ParticleType>::Particle
 (
@@ -47,20 +46,26 @@ Foam::Particle<ParticleType>::Particle
 :
     cloud_(cloud),
     facei_(-1),
-    stepFraction_(0.0)
+    stepFraction_(0.0),
+    origProc_(Pstream::myProcNo()),
+    origId_(-1)
 {
     if (is.format() == IOstream::ASCII)
     {
-        is >> position_ >> celli_;
+        is >> position_ >> celli_ >> origProc_ >> origId_;
     }
     else
     {
-        // In binary read both celli_ and facei_, needed for parallel transfer
+        // In binary read all particle data - needed for parallel transfer
         is.read
         (
             reinterpret_cast<char*>(&position_),
-            sizeof(position_) + sizeof(celli_)
-          + sizeof(facei_) + sizeof(stepFraction_)
+            sizeof(position_)
+            + sizeof(celli_)
+            + sizeof(facei_)
+            + sizeof(stepFraction_)
+            + sizeof(origProc_)
+            + sizeof(origId_)
         );
     }
 
@@ -92,7 +97,9 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const Particle<ParticleType>& p)
     if (os.format() == IOstream::ASCII)
     {
         os << p.position_
-           << token::SPACE << p.celli_;
+           << token::SPACE << p.celli_
+           << token::SPACE << p.origProc_
+           << token::SPACE << p.origId_;
     }
     else
     {
@@ -100,8 +107,12 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const Particle<ParticleType>& p)
         os.write
         (
             reinterpret_cast<const char*>(&p.position_),
-            sizeof(p.position_) + sizeof(p.celli_)
-          + sizeof(p.facei_) + sizeof(p.stepFraction_)
+            sizeof(p.position_)
+          + sizeof(p.celli_)
+          + sizeof(p.facei_)
+          + sizeof(p.stepFraction_)
+          + sizeof(p.origProc_)
+          + sizeof(p.origId_)
         );
     }
 
diff --git a/src/lagrangian/basic/ParticleTrackingData/ParticleTrackingData.C b/src/lagrangian/basic/ParticleTrackingData/ParticleTrackingData.C
deleted file mode 100644
index 80f1dcaaf7..0000000000
--- a/src/lagrangian/basic/ParticleTrackingData/ParticleTrackingData.C
+++ /dev/null
@@ -1,72 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-#include "ParticleTrackingData.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-template<class ParcelType>
-Foam::label Foam::ParticleTrackingData<ParcelType>::PARTICLE_COUNT = 0;
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-template<class ParcelType>
-Foam::ParticleTrackingData<ParcelType>::ParticleTrackingData
-(
-    const Cloud<ParcelType>& cloud
-)
-:
-    cloud_(cloud),
-    origProc_(Pstream::myProcNo()),
-    id_(PARTICLE_COUNT++)
-{}
-
-
-template<class ParcelType>
-Foam::ParticleTrackingData<ParcelType>::ParticleTrackingData
-(
-    const ParticleTrackingData& ptd
-)
-:
-    cloud_(ptd.cloud_),
-    origProc_(ptd.origProc_),
-    id_(ptd.id_)
-{}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-template<class ParcelType>
-Foam::ParticleTrackingData<ParcelType>::~ParticleTrackingData()
-{}
-
-
-// * * * * * * * * * * * * * * IOStream operators  * * * * * * * * * * * * * //
-
-#include "ParticleTrackingDataIO.C"
-
-// ************************************************************************* //
diff --git a/src/lagrangian/basic/ParticleTrackingData/ParticleTrackingData.H b/src/lagrangian/basic/ParticleTrackingData/ParticleTrackingData.H
deleted file mode 100644
index c752c2ec36..0000000000
--- a/src/lagrangian/basic/ParticleTrackingData/ParticleTrackingData.H
+++ /dev/null
@@ -1,166 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Class
-    Foam::ParticleTrackingData
-
-Description
-    Class to provide additional properties to allow construction of
-    particle tracks
-
-SourceFiles
-    ParticleTrackingData.C
-    ParticleTrackingDataIO.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef ParticleTrackingData_H
-#define ParticleTrackingData_H
-
-#include "Cloud.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// Forward declaration of classes and friend functions
-template<class ParcelType>
-class ParticleTrackingData;
-
-
-template<class ParcelType>
-Ostream& operator<<
-(
-    Ostream&,
-    const ParticleTrackingData<ParcelType>&
-);
-
-
-/*---------------------------------------------------------------------------*\
-                   Class ParticleTrackingData Declaration
-\*---------------------------------------------------------------------------*/
-
-template<class ParcelType>
-class ParticleTrackingData
-{
-    // Private data
-
-        //- Reference to the cloud
-        const Cloud<ParcelType>& cloud_;
-
-        //- Originating processor id
-        label origProc_;
-
-        //- Local particle id
-        label id_;
-
-        //- Cumulative particle count used for particle id
-        static label PARTICLE_COUNT;
-
-
-    // Private member functions
-
-        //- Write properties - particle count
-        static void writeProperties(const Cloud<ParcelType>& cloud);
-
-        //- Read properties - particle count
-        static void readProperties(const Cloud<ParcelType>& cloud);
-
-
-public:
-
-    // Constructors
-
-        //- Construct from cloud
-        ParticleTrackingData(const Cloud<ParcelType>& cloud);
-
-        //- Construct copy
-        ParticleTrackingData(const ParticleTrackingData& ptd);
-
-        //- Construct from Istream and mesh
-        ParticleTrackingData
-        (
-            const Cloud<ParcelType>& cloud,
-            Istream& is,
-            bool readFields
-        );
-
-
-    //- Destructor
-    ~ParticleTrackingData();
-
-
-    // Member functions
-
-        // Access
-
-            //- Return const access to the cloud
-            inline const Cloud<ParcelType>& cloud() const;
-
-            //- Return const access to the originating processor id
-            inline label origProc() const;
-
-            //- Return const access to the local particle id
-            inline label id() const;
-
-
-    // I-O
-
-        //- Read fields
-        static void readFields(Cloud<ParcelType>& c);
-
-        //- Write fields
-        static void writeFields(const Cloud<ParcelType>& c);
-
-
-    // Ostream Operator
-
-        friend Ostream& operator<< <ParcelType>
-        (
-            Ostream&,
-            const ParticleTrackingData<ParcelType>&
-        );
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#include "ParticleTrackingDataI.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#ifdef NoRepository
-#   include "ParticleTrackingData.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/lagrangian/basic/ParticleTrackingData/ParticleTrackingDataI.H b/src/lagrangian/basic/ParticleTrackingData/ParticleTrackingDataI.H
deleted file mode 100644
index da195d5627..0000000000
--- a/src/lagrangian/basic/ParticleTrackingData/ParticleTrackingDataI.H
+++ /dev/null
@@ -1,49 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-template<class ParcelType>
-inline const Foam::Cloud<ParcelType>&
-Foam::ParticleTrackingData<ParcelType>::cloud() const
-{
-    return cloud_;
-}
-
-
-template<class ParcelType>
-inline Foam::label Foam::ParticleTrackingData<ParcelType>::origProc() const
-{
-    return origProc_;
-}
-
-
-template<class ParcelType>
-inline Foam::label Foam::ParticleTrackingData<ParcelType>::id() const
-{
-    return id_;
-}
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/basic/ParticleTrackingData/ParticleTrackingDataIO.C b/src/lagrangian/basic/ParticleTrackingData/ParticleTrackingDataIO.C
deleted file mode 100644
index e575426eea..0000000000
--- a/src/lagrangian/basic/ParticleTrackingData/ParticleTrackingDataIO.C
+++ /dev/null
@@ -1,233 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-#include "ParticleTrackingData.H"
-
-// * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * * //
-
-template<class ParcelType>
-void Foam::ParticleTrackingData<ParcelType>::readProperties
-(
-    const Cloud<ParcelType>& cloud
-)
-{
-    IOobject propsDictHeader
-    (
-        "particleTrackingProperties",
-        cloud.db().time().timeName(),
-        "uniform/Lagrangian"/cloud.name(),
-        cloud.db(),
-        IOobject::MUST_READ,
-        IOobject::NO_WRITE,
-        false
-    );
-
-    if (propsDictHeader.headerOk())
-    {
-        const IOdictionary propsDict(propsDictHeader);
-
-        word procName("processor" + name(Pstream::myProcNo()));
-        if (propsDict.found(procName))
-        {
-            propsDict.subDict(procName).lookup("particleCount") >>
-                PARTICLE_COUNT;
-        }
-    }
-}
-
-
-template<class ParcelType>
-void Foam::ParticleTrackingData<ParcelType>::writeProperties
-(
-    const Cloud<ParcelType>& cloud
-)
-{
-    if (cloud.db().time().outputTime())
-    {
-        IOdictionary propsDict
-        (
-            IOobject
-            (
-                "particleTrackingProperties",
-                cloud.db().time().timeName(),
-                "uniform/Lagrangian"/cloud.name(),
-                cloud.db(),
-                IOobject::NO_READ,
-                IOobject::NO_WRITE,
-                false
-            )
-        );
-
-        word procName("processor" + name(Pstream::myProcNo()));
-        propsDict.add(procName, dictionary());
-        propsDict.subDict(procName).add("particleCount", PARTICLE_COUNT);
-
-        propsDict.regIOobject::write();
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-template<class ParcelType>
-Foam::ParticleTrackingData<ParcelType>::ParticleTrackingData
-(
-    const Cloud<ParcelType>& cloud,
-    Istream& is,
-    bool readFields
-)
-:
-    cloud_(cloud),
-    origProc_(-1),
-    id_(-1)
-{
-    if (readFields)
-    {
-        if (is.format() == IOstream::ASCII)
-        {
-            is >> origProc_ >> id_;
-        }
-        else
-        {
-            is.read
-            (
-                reinterpret_cast<char*>(&origProc_),
-                sizeof(origProc_) + sizeof(id_)
-            );
-        }
-    }
-
-    // Check state of Istream
-    is.check
-    (
-        "ParticleTrackingData<ParcelType>::ParticleTrackingData"
-        "("
-            "Istream&, "
-            "bool"
-        ")"
-    );
-}
-
-
-template<class ParcelType>
-void Foam::ParticleTrackingData<ParcelType>::readFields
-(
-    Cloud<ParcelType>& c
-)
-{
-    if (!c.size())
-    {
-        return;
-    }
-
-    readProperties(c);
-
-    IOField<label> origProc(c.fieldIOobject("origProc", IOobject::MUST_READ));
-    c.checkFieldIOobject(c, origProc);
-
-    IOField<label> id(c.fieldIOobject("id", IOobject::MUST_READ));
-    c.checkFieldIOobject(c, id);
-
-    label i = 0;
-    forAllIter(typename Cloud<ParcelType>, c, iter)
-    {
-        ParcelType& p = iter();
-        p.origProc_ = origProc[i];
-        p.id_ = id[i];
-        i++;
-    }
-}
-
-
-template<class ParcelType>
-void Foam::ParticleTrackingData<ParcelType>::writeFields
-(
-    const Cloud<ParcelType>& c
-)
-{
-    writeProperties(c);
-
-    const label np = c.size();
-
-    IOField<label> origProc
-        (
-            c.fieldIOobject("origProc", IOobject::NO_READ),
-            np
-        );
-    IOField<label> id(c.fieldIOobject("id", IOobject::NO_READ), np);
-
-    label i = 0;
-    forAllConstIter(typename Cloud<ParcelType>, c, iter)
-    {
-        const ParcelType& p = iter();
-
-        origProc[i] = p.origProc();
-        id[i] = p.id();
-        i++;
-    }
-
-    origProc.write();
-    id.write();
-}
-
-
-// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
-
-template<class ParcelType>
-Foam::Ostream& Foam::operator<<
-(
-    Ostream& os,
-    const ParticleTrackingData<ParcelType>& p
-)
-{
-    if (os.format() == IOstream::ASCII)
-    {
-        os  << p.origProc_ << token::SPACE << p.id_ << token::SPACE;
-    }
-    else
-    {
-        os.write
-        (
-            reinterpret_cast<const char*>(&p.origProc_),
-            sizeof(p.origProc_) + sizeof(p.id_)
-        );
-    }
-
-    // Check state of Ostream
-    os.check
-    (
-        "Ostream& operator<<"
-        "("
-            "Ostream&, "
-            "const ParticleTrackingData<ParcelType>&"
-        ")"
-    );
-
-    return os;
-}
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/Make/files b/src/lagrangian/intermediate/Make/files
index de8bcd3321..c07a3a34fa 100644
--- a/src/lagrangian/intermediate/Make/files
+++ b/src/lagrangian/intermediate/Make/files
@@ -23,7 +23,6 @@ $(DERIVEDCLOUDS)/basicKinematicCloud/basicKinematicCloud.C
 $(DERIVEDCLOUDS)/basicThermoCloud/basicThermoCloud.C
 $(DERIVEDCLOUDS)/BasicReactingCloud/defineBasicReactingCloud.C
 $(DERIVEDCLOUDS)/BasicReactingMultiphaseCloud/defineBasicReactingMultiphaseCloud.C
-$(DERIVEDCLOUDS)/BasicTrackedReactingCloud/defineBasicTrackedReactingCloud.C
 
 
 /* kinematic parcel sub-models */
@@ -46,12 +45,6 @@ $(REACTINGPARCEL)/defineBasicReactingParcel.C
 $(REACTINGPARCEL)/makeBasicReactingParcelSubmodels.C
 
 
-/* tracked reacting parcel sub-models */
-TRACKEDREACTINGPARCEL=$(DERIVEDPARCELS)/BasicTrackedReactingParcel
-$(TRACKEDREACTINGPARCEL)/defineTrackedReactingParcel.C
-$(TRACKEDREACTINGPARCEL)/makeBasicTrackedReactingParcelSubmodels.C
-
-
 /* reacting multiphase parcel sub-models */
 REACTINGMPPARCEL=$(DERIVEDPARCELS)/BasicReactingMultiphaseParcel
 $(REACTINGMPPARCEL)/defineBasicReactingMultiphaseParcel.C
diff --git a/src/lagrangian/intermediate/clouds/derived/BasicTrackedReactingCloud/BasicTrackedReactingCloud.C b/src/lagrangian/intermediate/clouds/derived/BasicTrackedReactingCloud/BasicTrackedReactingCloud.C
deleted file mode 100644
index 15b7774a0b..0000000000
--- a/src/lagrangian/intermediate/clouds/derived/BasicTrackedReactingCloud/BasicTrackedReactingCloud.C
+++ /dev/null
@@ -1,70 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-#include "BasicTrackedReactingCloud.H"
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-template<class ThermoType>
-Foam::BasicTrackedReactingCloud<ThermoType>::BasicTrackedReactingCloud
-(
-    const word& cloudName,
-    const volScalarField& rho,
-    const volVectorField& U,
-    const dimensionedVector& g,
-    basicThermo& thermo
-)
-:
-    ReactingCloud<BasicTrackedReactingParcel<ThermoType> >
-    (
-        cloudName,
-        rho,
-        U,
-        g,
-        thermo
-    )
-{
-    BasicTrackedReactingParcel<ThermoType>::readFields(*this);
-}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-template<class ThermoType>
-Foam::BasicTrackedReactingCloud<ThermoType>::~BasicTrackedReactingCloud()
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class ThermoType>
-void Foam::BasicTrackedReactingCloud<ThermoType>::writeFields() const
-{
-    BasicTrackedReactingParcel<ThermoType>::writeFields(*this);
-}
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/derived/BasicTrackedReactingCloud/BasicTrackedReactingCloud.H b/src/lagrangian/intermediate/clouds/derived/BasicTrackedReactingCloud/BasicTrackedReactingCloud.H
deleted file mode 100644
index bb2b0bde1e..0000000000
--- a/src/lagrangian/intermediate/clouds/derived/BasicTrackedReactingCloud/BasicTrackedReactingCloud.H
+++ /dev/null
@@ -1,113 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Class
-    Foam::BasicTrackedReactingCloud
-
-Description
-    Tracked racting cloud templated on the type of carrier phase thermodynamics
-
-SourceFiles
-    BasicTrackedReactingCloud.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef BasicTrackedReactingCloud_H
-#define BasicTrackedReactingCloud_H
-
-#include "ReactingCloud.H"
-#include "BasicTrackedReactingParcel.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// Forward declaration of classes
-template<class ThermoType>
-class BasicTrackedReactingCloud;
-
-/*---------------------------------------------------------------------------*\
-                 Class BasicTrackedReactingCloud Declaration
-\*---------------------------------------------------------------------------*/
-
-template<class ThermoType>
-class BasicTrackedReactingCloud
-:
-    public ReactingCloud<BasicTrackedReactingParcel<ThermoType> >
-{
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        BasicTrackedReactingCloud(const BasicTrackedReactingCloud&);
-
-        //- Disallow default bitwise assignment
-        void operator=(const BasicTrackedReactingCloud&);
-
-
-public:
-
-    //- Runtime type information
-    TypeName("BasicTrackedReactingCloud");
-
-
-    // Constructors
-
-        //- Construct given carrier gas fields
-        BasicTrackedReactingCloud
-        (
-            const word& cloudName,
-            const volScalarField& rho,
-            const volVectorField& U,
-            const dimensionedVector& g,
-            basicThermo& thermo
-        );
-
-
-    //- Destructor
-    ~BasicTrackedReactingCloud();
-
-
-    // Member Functions
-
-        //- Write fields
-        void writeFields() const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#ifdef NoRepository
-    #include "BasicTrackedReactingCloud.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/derived/BasicTrackedReactingCloud/defineBasicTrackedReactingCloud.C b/src/lagrangian/intermediate/clouds/derived/BasicTrackedReactingCloud/defineBasicTrackedReactingCloud.C
deleted file mode 100644
index 5c946ca09c..0000000000
--- a/src/lagrangian/intermediate/clouds/derived/BasicTrackedReactingCloud/defineBasicTrackedReactingCloud.C
+++ /dev/null
@@ -1,38 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-#include "createReactingCloudTypes.H"
-#include "BasicTrackedReactingCloud.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    createReactingCloudType(BasicTrackedReactingCloud);
-};
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/Templates/TrackedReactingParcel/TrackedReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/TrackedReactingParcel/TrackedReactingParcel.C
deleted file mode 100644
index b41cb31df9..0000000000
--- a/src/lagrangian/intermediate/parcels/Templates/TrackedReactingParcel/TrackedReactingParcel.C
+++ /dev/null
@@ -1,47 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-#include "TrackedReactingParcel.H"
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-template <class ParcelType>
-Foam::TrackedReactingParcel<ParcelType>::TrackedReactingParcel
-(
-    const TrackedReactingParcel<ParcelType>& p
-)
-:
-    ReactingParcel<ParcelType>(p),
-    ParticleTrackingData<ParcelType>(p)
-{}
-
-
-// * * * * * * * * * * * * * * IOStream operators  * * * * * * * * * * * * * //
-
-#include "TrackedReactingParcelIO.C"
-
-// ************************************************************************* //
-
diff --git a/src/lagrangian/intermediate/parcels/Templates/TrackedReactingParcel/TrackedReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/TrackedReactingParcel/TrackedReactingParcel.H
deleted file mode 100644
index 8df58f8d2c..0000000000
--- a/src/lagrangian/intermediate/parcels/Templates/TrackedReactingParcel/TrackedReactingParcel.H
+++ /dev/null
@@ -1,169 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Class
-    Foam::TrackedReactingParcel
-
-Description
-    Adds tracking to ReactingParcel
-
-SourceFiles
-    TrackedReactingParcelI.H
-    TrackedReactingParcel.C
-    TrackedReactingParcelIO.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef TrackedReactingParcel_H
-#define TrackedReactingParcel_H
-
-#include "ReactingParcel.H"
-#include "ParticleTrackingData.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-template<class ParcelType>
-class TrackedReactingParcel;
-
-// Forward declaration of friend functions
-
-template<class ParcelType>
-Ostream& operator<<
-(
-    Ostream&,
-    const TrackedReactingParcel<ParcelType>&
-);
-
-/*---------------------------------------------------------------------------*\
-                  Class TrackedReactingParcel Declaration
-\*---------------------------------------------------------------------------*/
-
-template<class ParcelType>
-class TrackedReactingParcel
-:
-    public ReactingParcel<ParcelType>,
-    public ParticleTrackingData<ParcelType>
-{
-public:
-
-    typedef typename ReactingParcel<ParcelType>::constantProperties
-        constantProperties;
-
-    // Static data
-
-        //- Runtime type information
-        TypeName("TrackedReactingParcel");
-
-
-    // Constructors
-
-        //- Construct from owner, position, and cloud owner
-        //  Other properties initialised as null
-        inline TrackedReactingParcel
-        (
-            ReactingCloud<ParcelType>& owner,
-            const vector& position,
-            const label cellI
-        );
-
-        //- Construct from components
-        inline TrackedReactingParcel
-        (
-            ReactingCloud<ParcelType>& owner,
-            const vector& position,
-            const label cellI,
-            const label typeId,
-            const scalar nParticle0,
-            const scalar d0,
-            const vector& U0,
-            const scalarField& Y0,
-            const constantProperties& constProps
-        );
-
-        //- Construct from Istream
-        TrackedReactingParcel
-        (
-            const Cloud<ParcelType>& c,
-            Istream& is,
-            bool readFields = true
-        );
-
-        //- Construct as a copy
-        TrackedReactingParcel(const TrackedReactingParcel& p);
-
-        //- Construct and return a clone
-        autoPtr<TrackedReactingParcel> clone() const
-        {
-            return
-                autoPtr<TrackedReactingParcel>
-                (
-                    new TrackedReactingParcel(*this)
-                );
-        }
-
-
-    // Member Functions
-
-        // I-O
-
-            //- Read
-            static void readFields(ReactingCloud<ParcelType>& c);
-
-            //- Write
-            static void writeFields(const ReactingCloud<ParcelType>& c);
-
-
-    // Ostream Operator
-
-        friend Ostream& operator<< <ParcelType>
-        (
-            Ostream&,
-            const TrackedReactingParcel<ParcelType>&
-        );
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#include "TrackedReactingParcelI.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#ifdef NoRepository
-    #include "TrackedReactingParcel.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
-
diff --git a/src/lagrangian/intermediate/parcels/Templates/TrackedReactingParcel/TrackedReactingParcelI.H b/src/lagrangian/intermediate/parcels/Templates/TrackedReactingParcel/TrackedReactingParcelI.H
deleted file mode 100644
index a3bf01eb35..0000000000
--- a/src/lagrangian/intermediate/parcels/Templates/TrackedReactingParcel/TrackedReactingParcelI.H
+++ /dev/null
@@ -1,72 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-template <class ParcelType>
-inline Foam::TrackedReactingParcel<ParcelType>::TrackedReactingParcel
-(
-    ReactingCloud<ParcelType>& owner,
-    const vector& position,
-    const label cellI
-)
-:
-    ReactingParcel<ParcelType>(owner, position, cellI),
-    ParticleTrackingData<ParcelType>(owner)
-{}
-
-
-template <class ParcelType>
-inline Foam::TrackedReactingParcel<ParcelType>::TrackedReactingParcel
-(
-    ReactingCloud<ParcelType>& owner,
-    const vector& position,
-    const label cellI,
-    const label typeId,
-    const scalar nParticle0,
-    const scalar d0,
-    const vector& U0,
-    const scalarField& Y0,
-    const constantProperties& constProps
-)
-:
-    ReactingParcel<ParcelType>
-    (
-        owner,
-        position,
-        cellI,
-        typeId,
-        nParticle0,
-        d0,
-        U0,
-        Y0,
-        constProps
-    ),
-    ParticleTrackingData<ParcelType>(owner)
-{}
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/Templates/TrackedReactingParcel/TrackedReactingParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/TrackedReactingParcel/TrackedReactingParcelIO.C
deleted file mode 100644
index 8ce5d9b2f2..0000000000
--- a/src/lagrangian/intermediate/parcels/Templates/TrackedReactingParcel/TrackedReactingParcelIO.C
+++ /dev/null
@@ -1,105 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-#include "TrackedReactingParcel.H"
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-template <class ParcelType>
-Foam::TrackedReactingParcel<ParcelType>::TrackedReactingParcel
-(
-    const Cloud<ParcelType>& cloud,
-    Istream& is,
-    bool readFields
-)
-:
-    ReactingParcel<ParcelType>(cloud, is, readFields),
-    ParticleTrackingData<ParcelType>(cloud, is, readFields)
-{}
-
-
-template<class ParcelType>
-void Foam::TrackedReactingParcel<ParcelType>::readFields
-(
-    ReactingCloud<ParcelType>& c
-)
-{
-    if (!c.size())
-    {
-        return;
-    }
-
-    ReactingParcel<ParcelType>::readFields(c);
-    ParticleTrackingData<ParcelType>::readFields(c);
-}
-
-
-template<class ParcelType>
-void Foam::TrackedReactingParcel<ParcelType>::writeFields
-(
-    const ReactingCloud<ParcelType>& c
-)
-{
-    ReactingParcel<ParcelType>::writeFields(c);
-    ParticleTrackingData<ParcelType>::writeFields(c);
-}
-
-
-// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
-
-template<class ParcelType>
-Foam::Ostream& Foam::operator<<
-(
-    Ostream& os,
-    const TrackedReactingParcel<ParcelType>& p
-)
-{
-    if (os.format() == IOstream::ASCII)
-    {
-        os  << static_cast<const ReactingParcel<ParcelType>&>(p)
-            << static_cast<const ParticleTrackingData<ParcelType>&>(p);
-    }
-    else
-    {
-        os  << static_cast<const ReactingParcel<ParcelType>&>(p)
-            << static_cast<const ParticleTrackingData<ParcelType>&>(p);
-    }
-
-    // Check state of Ostream
-    os.check
-    (
-        "Ostream& operator<<"
-        "("
-            "Ostream&, "
-            "const TrackedReactingParcel<ParcelType>&"
-        ")"
-    );
-
-    return os;
-}
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/BasicTrackedReactingParcel/BasicTrackedReactingParcel.C b/src/lagrangian/intermediate/parcels/derived/BasicTrackedReactingParcel/BasicTrackedReactingParcel.C
deleted file mode 100644
index db48ba437f..0000000000
--- a/src/lagrangian/intermediate/parcels/derived/BasicTrackedReactingParcel/BasicTrackedReactingParcel.C
+++ /dev/null
@@ -1,113 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-#include "BasicTrackedReactingParcel.H"
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-template<class ThermoType>
-Foam::BasicTrackedReactingParcel<ThermoType>::BasicTrackedReactingParcel
-(
-    ReactingCloud<BasicTrackedReactingParcel<ThermoType> >& owner,
-    const vector& position,
-    const label cellI
-)
-:
-    TrackedReactingParcel<BasicTrackedReactingParcel<ThermoType> >
-    (
-        owner,
-        position,
-        cellI
-    )
-{}
-
-
-template<class ThermoType>
-Foam::BasicTrackedReactingParcel<ThermoType>::BasicTrackedReactingParcel
-(
-    ReactingCloud<BasicTrackedReactingParcel<ThermoType> >& owner,
-    const vector& position,
-    const label cellI,
-    const label typeId,
-    const scalar nParticle0,
-    const scalar d0,
-    const vector& U0,
-    const scalarField& Y0,
-    const typename
-        TrackedReactingParcel<BasicTrackedReactingParcel<ThermoType> >::
-        constantProperties& constProps
-)
-:
-    TrackedReactingParcel<BasicTrackedReactingParcel<ThermoType> >
-    (
-        owner,
-        position,
-        cellI,
-        typeId,
-        nParticle0,
-        d0,
-        U0,
-        Y0,
-        constProps
-    )
-{}
-
-
-template<class ThermoType>
-Foam::BasicTrackedReactingParcel<ThermoType>::BasicTrackedReactingParcel
-(
-    const Cloud<BasicTrackedReactingParcel<ThermoType> >& cloud,
-    Istream& is,
-    bool readFields
-)
-:
-    TrackedReactingParcel<BasicTrackedReactingParcel<ThermoType> >
-    (
-        cloud,
-        is,
-        readFields
-    )
-{}
-
-
-template<class ThermoType>
-Foam::BasicTrackedReactingParcel<ThermoType>::BasicTrackedReactingParcel
-(
-    const BasicTrackedReactingParcel<ThermoType>& p
-)
-:
-    TrackedReactingParcel<BasicTrackedReactingParcel<ThermoType> >(p)
-{}
-
-
-// * * * * * * * * * * * * * * * *  Destructors  * * * * * * * * * * * * * * //
-
-template<class ThermoType>
-Foam::BasicTrackedReactingParcel<ThermoType>::~BasicTrackedReactingParcel()
-{}
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/BasicTrackedReactingParcel/BasicTrackedReactingParcel.H b/src/lagrangian/intermediate/parcels/derived/BasicTrackedReactingParcel/BasicTrackedReactingParcel.H
deleted file mode 100644
index 8c30301f9c..0000000000
--- a/src/lagrangian/intermediate/parcels/derived/BasicTrackedReactingParcel/BasicTrackedReactingParcel.H
+++ /dev/null
@@ -1,137 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Class
-    Foam::BasicTrackedReactingParcel
-
-Description
-
-
-SourceFiles
-    BasicTrackedReactingParcel.C
-    BasicTrackedReactingParcelIO.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef BasicTrackedReactingParcel_H
-#define BasicTrackedReactingParcel_H
-
-#include "TrackedReactingParcel.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// Forward declaration of classes
-template<class ThermoType>
-class BasicTrackedReactingParcel;
-
-/*---------------------------------------------------------------------------*\
-                 Class BasicTrackedReactingParcel Declaration
-\*---------------------------------------------------------------------------*/
-
-template<class ThermoType>
-class BasicTrackedReactingParcel
-:
-    public TrackedReactingParcel<BasicTrackedReactingParcel<ThermoType> >
-{
-
-public:
-
-    //- The type of thermodynamics this parcel was instantiated for
-    typedef ThermoType thermoType;
-
-    //- Run-time type information
-    TypeName("BasicTrackedReactingParcel");
-
-    // Constructors
-
-        //- Construct from owner, position, and cloud owner
-        //  Other properties initialised as null
-        BasicTrackedReactingParcel
-        (
-            ReactingCloud<BasicTrackedReactingParcel>& owner,
-            const vector& position,
-            const label cellI
-        );
-
-        //- Construct from components
-        BasicTrackedReactingParcel
-        (
-            ReactingCloud<BasicTrackedReactingParcel>& owner,
-            const vector& position,
-            const label cellI,
-            const label typeId,
-            const scalar nParticle0,
-            const scalar d0,
-            const vector& U0,
-            const scalarField& Y0,
-            const typename
-                TrackedReactingParcel<BasicTrackedReactingParcel>::
-                constantProperties& constProps
-        );
-
-        //- Construct from Istream
-        BasicTrackedReactingParcel
-        (
-            const Cloud<BasicTrackedReactingParcel>& c,
-            Istream& is,
-            bool readFields = true
-        );
-
-        //- Construct as a copy
-        BasicTrackedReactingParcel(const BasicTrackedReactingParcel& p);
-
-        //- Construct and return a clone
-        autoPtr<BasicTrackedReactingParcel> clone() const
-        {
-            return
-                autoPtr<BasicTrackedReactingParcel>
-                (
-                    new BasicTrackedReactingParcel(*this)
-                );
-        }
-
-
-    //- Destructor
-    virtual ~BasicTrackedReactingParcel();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#ifdef NoRepository
-    #include "BasicTrackedReactingParcel.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/BasicTrackedReactingParcel/defineTrackedReactingParcel.C b/src/lagrangian/intermediate/parcels/derived/BasicTrackedReactingParcel/defineTrackedReactingParcel.C
deleted file mode 100644
index 239ebccb3b..0000000000
--- a/src/lagrangian/intermediate/parcels/derived/BasicTrackedReactingParcel/defineTrackedReactingParcel.C
+++ /dev/null
@@ -1,38 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-#include "createTrackedReactingParcelTypes.H"
-#include "BasicTrackedReactingParcel.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    createTrackedReactingParcelType(BasicTrackedReactingParcel);
-}
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/BasicTrackedReactingParcel/makeBasicTrackedReactingParcelSubmodels.C b/src/lagrangian/intermediate/parcels/derived/BasicTrackedReactingParcel/makeBasicTrackedReactingParcelSubmodels.C
deleted file mode 100644
index 7d94a79bea..0000000000
--- a/src/lagrangian/intermediate/parcels/derived/BasicTrackedReactingParcel/makeBasicTrackedReactingParcelSubmodels.C
+++ /dev/null
@@ -1,63 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-#include "BasicTrackedReactingParcel.H"
-
-// Kinematic
-#include "makeReactingParcelDispersionModels.H"
-#include "makeReactingParcelDragModels.H"
-#include "makeReactingParcelInjectionModels.H"
-#include "makeReactingParcelPatchInteractionModels.H"
-#include "makeReactingParcelPostProcessingModels.H"
-
-// Thermo
-#include "makeReactingParcelHeatTransferModels.H"
-
-// Reacting
-#include "makeReactingParcelCompositionModels.H"
-#include "makeReactingParcelPhaseChangeModels.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    // Kinematic sub-models
-    makeReactingDispersionModels(BasicTrackedReactingParcel);
-    makeReactingDragModels(BasicTrackedReactingParcel);
-    makeReactingInjectionModels(BasicTrackedReactingParcel);
-    makeReactingPatchInteractionModels(BasicTrackedReactingParcel);
-    makeReactingPostProcessingModels(BasicTrackedReactingParcel);
-
-    // Thermo sub-models
-    makeReactingHeatTransferModels(BasicTrackedReactingParcel);
-
-    // Reacting sub-models
-    makeReactingCompositionModels(BasicTrackedReactingParcel);
-    makeReactingPhaseChangeModels(BasicTrackedReactingParcel);
-};
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index c102d87a3d..fa48f4c28b 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
@@ -37,7 +37,7 @@ void Foam::InjectionModel<CloudType>::readProps()
     (
         "injectionProperties",
         owner_.db().time().timeName(),
-        "uniform/Lagrangian"/owner_.name(),
+        "uniform"/cloud::prefix/owner_.name(),
         owner_.db(),
         IOobject::MUST_READ,
         IOobject::NO_WRITE,
@@ -67,7 +67,7 @@ void Foam::InjectionModel<CloudType>::writeProps()
             (
                 "injectionProperties",
                 owner_.db().time().timeName(),
-                "uniform/Lagrangian"/owner_.name(),
+                "uniform"/cloud::prefix/owner_.name(),
                 owner_.db(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
diff --git a/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.H b/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.H
index 1a476f66a9..a3d936757e 100644
--- a/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.H
+++ b/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.H
@@ -105,6 +105,7 @@ private:
             //  - schedule
             mutable autoPtr<mapDistribute> mapPtr_;
 
+
     // Private Member Functions
 
         //- Collect single list of samples and originating processor+face.
@@ -162,7 +163,7 @@ private:
 public:
 
     //- Runtime type information
-    ClassName("directMappedPatchBase");
+    TypeName("directMappedPatchBase");
 
 
     // Constructors
@@ -177,15 +178,14 @@ public:
         directMappedPatchBase(const polyPatch&, const directMappedPatchBase&);
 
 
-    // Destructor
-
-        ~directMappedPatchBase();
-
-        void clearOut();
+    //- Destructor
+    virtual ~directMappedPatchBase();
 
 
     // Member functions
 
+        void clearOut();
+
         //- What to sample
         const sampleMode& mode() const
         {
diff --git a/src/meshTools/directMapped/directMappedPolyPatch/directMappedPolyPatch.H b/src/meshTools/directMapped/directMappedPolyPatch/directMappedPolyPatch.H
index 522564b337..fdd4baec85 100644
--- a/src/meshTools/directMapped/directMappedPolyPatch/directMappedPolyPatch.H
+++ b/src/meshTools/directMapped/directMappedPolyPatch/directMappedPolyPatch.H
@@ -151,9 +151,8 @@ public:
         }
 
 
-    // Destructor
-
-        ~directMappedPolyPatch();
+    //- Destructor
+    virtual ~directMappedPolyPatch();
 
 
     // Member functions
diff --git a/src/meshTools/directMapped/directMappedPolyPatch/directMappedWallPolyPatch.H b/src/meshTools/directMapped/directMappedPolyPatch/directMappedWallPolyPatch.H
index 407d62ddda..457552e421 100644
--- a/src/meshTools/directMapped/directMappedPolyPatch/directMappedWallPolyPatch.H
+++ b/src/meshTools/directMapped/directMappedPolyPatch/directMappedWallPolyPatch.H
@@ -158,9 +158,8 @@ public:
         }
 
 
-    // Destructor
-
-        ~directMappedWallPolyPatch();
+    //- Destructor
+    virtual ~directMappedWallPolyPatch();
 
 
     // Member functions
diff --git a/src/thermophysicalModels/specie/Make/files b/src/thermophysicalModels/specie/Make/files
index d5ea884797..428f6d8fc7 100644
--- a/src/thermophysicalModels/specie/Make/files
+++ b/src/thermophysicalModels/specie/Make/files
@@ -8,7 +8,6 @@ $(atomicWeights)/atomicWeights.C
 $(specie)/specie.C
 $(speciesTable)/speciesTable.C
 $(equationOfState)/perfectGas/perfectGas.C
-$(equationOfState)/icoPolynomial/makeIcoPolynomials.C
 $(reactions)/makeChemkinReactions.C
 $(reactions)/makeReactionThermoReactions.C
 $(reactions)/makeLangmuirHinshelwoodReactions.C
diff --git a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H
index b23de491d1..27190fd833 100644
--- a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H
+++ b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H
@@ -105,8 +105,6 @@ class icoPolynomial
 
 public:
 
-    TypeName("icoPolynomial")
-
     // Constructors
 
         //- Construct from components
diff --git a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/makeIcoPolynomials.C b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/makeIcoPolynomials.C
deleted file mode 100644
index e4136284c0..0000000000
--- a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/makeIcoPolynomials.C
+++ /dev/null
@@ -1,44 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-#include "icoPolynomial.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    makeIcoPolynomial(1)
-    makeIcoPolynomial(2)
-    makeIcoPolynomial(3)
-    makeIcoPolynomial(4)
-    makeIcoPolynomial(5)
-    makeIcoPolynomial(6)
-    makeIcoPolynomial(7)
-    makeIcoPolynomial(8)
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/T b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/T
index 5784dfae92..6009ab2e41 100644
--- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/T
+++ b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/T
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      T;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -21,425 +20,22 @@ internalField   uniform 300;
 
 boundaryField
 {
-    floor
-    {
-        type            fixedValue;
-        value           nonuniform List<scalar> 
-400
-(
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-600
-600
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-600
-600
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-300
-)
-;
-    }
-    ceiling
+    floor           
     {
         type            fixedValue;
         value           uniform 300;
     }
-    fixedWalls
+
+    ceiling         
+    {
+        type            fixedValue;
+        value           uniform 300;
+    }
+
+    fixedWalls      
     {
         type            zeroGradient;
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/0.org/G b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/G
similarity index 100%
rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/0.org/G
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/G
diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/0.org/H2O b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/H2O
similarity index 100%
rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/0.org/H2O
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/H2O
diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/0.org/N2 b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/N2
similarity index 100%
rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/0.org/N2
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/N2
diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/0.org/O2 b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/O2
similarity index 100%
rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/0.org/O2
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/O2
diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/0.org/T b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/T
similarity index 100%
rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/0.org/T
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/T
diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/0.org/U b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/U
similarity index 100%
rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/0.org/U
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/U
diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/0.org/alphat b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/alphat
similarity index 100%
rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/0.org/alphat
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/alphat
diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/0.org/epsilon b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/epsilon
similarity index 100%
rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/0.org/epsilon
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/epsilon
diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/0.org/k b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/k
similarity index 100%
rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/0.org/k
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/k
diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/0.org/mut b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/mut
similarity index 100%
rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/0.org/mut
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/mut
diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/0.org/p b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/p
similarity index 100%
rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/0.org/p
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/p
diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/0/G b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/G
similarity index 100%
rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/0/G
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/G
diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/0/H2O b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/H2O
similarity index 100%
rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/0/H2O
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/H2O
diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/0/N2 b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/N2
similarity index 100%
rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/0/N2
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/N2
diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/0/O2 b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/O2
similarity index 100%
rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/0/O2
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/O2
diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/0/T b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/T
similarity index 100%
rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/0/T
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/T
diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/0/U b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/U
similarity index 100%
rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/0/U
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/U
diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/0/alphat b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/alphat
similarity index 100%
rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/0/alphat
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/alphat
diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/0/epsilon b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/epsilon
similarity index 100%
rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/0/epsilon
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/epsilon
diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/0/k b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/k
similarity index 100%
rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/0/k
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/k
diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/0/mut b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/mut
similarity index 100%
rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/0/mut
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/mut
diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/0/p b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/p
similarity index 100%
rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/0/p
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/p
diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/Allclean b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allclean
similarity index 100%
rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/Allclean
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allclean
diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/Allrun b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allrun
similarity index 100%
rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/Allrun
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allrun
diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/RASProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/RASProperties
similarity index 100%
rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/RASProperties
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/RASProperties
diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/chemistryProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/chemistryProperties
similarity index 95%
rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/chemistryProperties
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/chemistryProperties
index 171565c21a..9123a87ab7 100644
--- a/tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/chemistryProperties
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/chemistryProperties
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-rhoChemistryModelType  ODEChemistryModel<icoPoly8ThermoPhysics>;
+rhoChemistryModel  ODEChemistryModel<icoPoly8ThermoPhysics>;
 
 chemistry       off;
 
diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/environmentalProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/environmentalProperties
similarity index 100%
rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/environmentalProperties
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/environmentalProperties
diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/parcelInjectionProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/parcelInjectionProperties
similarity index 100%
rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/parcelInjectionProperties
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/parcelInjectionProperties
diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/particleTrackProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/particleTrackProperties
similarity index 100%
rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/particleTrackProperties
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/particleTrackProperties
diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/pointMassSourcesProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/pointMassSourcesProperties
similarity index 100%
rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/pointMassSourcesProperties
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/pointMassSourcesProperties
diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/polyMesh/blockMeshDict b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/polyMesh/blockMeshDict
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/polyMesh/blockMeshDict
diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/porousZones b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/porousZones
similarity index 100%
rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/porousZones
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/porousZones
diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/radiationProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/radiationProperties
similarity index 98%
rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/radiationProperties
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/radiationProperties
index 1506c71447..19c0ae1def 100644
--- a/tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/radiationProperties
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/radiationProperties
@@ -17,7 +17,7 @@ FoamFile
 
 radiation       off;
 
-radiationModel  noRadiation;
+radiationModel  none;
 
 solverFreq      10;
 
diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/reactingCloud1Positions b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Positions
similarity index 100%
rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/reactingCloud1Positions
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Positions
diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties
similarity index 100%
rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/reactingCloud1Properties
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties
diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/reactions b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactions
similarity index 100%
rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/reactions
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactions
diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/thermo.incompressiblePoly b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/thermo.incompressiblePoly
similarity index 91%
rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/thermo.incompressiblePoly
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/thermo.incompressiblePoly
index f6e3daa3ee..4ca40c05fb 100644
--- a/tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/thermo.incompressiblePoly
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/thermo.incompressiblePoly
@@ -12,6 +12,7 @@ N2 N2   1   28.0134
         0
     )
     0.0                                 // Heat of formation
+    0.0                                 // Standard entropy
     cpPolynomial
     (
         2.75E+004
@@ -58,6 +59,7 @@ O2 O2   1   31.9988
         0
     )
     0.0                                 // Heat of formation
+    0.0                                 // Standard entropy
     cpPolynomial
     (
         2.67E+004
@@ -104,6 +106,7 @@ H2O H2O 1   18.0153
         0
     )
     -241.8                                 // Heat of formation
+    0.0                                    // Standard entropy
     cpPolynomial
     (
         2.85E+004
diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/thermophysicalProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/thermophysicalProperties
similarity index 100%
rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/thermophysicalProperties
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/thermophysicalProperties
diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/turbulenceProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/turbulenceProperties
similarity index 100%
rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/turbulenceProperties
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/turbulenceProperties
diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/system/cellSetDict b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/cellSetDict
similarity index 100%
rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/system/cellSetDict
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/cellSetDict
diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/system/controlDict b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/controlDict
similarity index 100%
rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/system/controlDict
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/controlDict
diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/system/decomposeParDict b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/decomposeParDict
similarity index 100%
rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/system/decomposeParDict
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/decomposeParDict
diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/system/fvSchemes b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/fvSchemes
similarity index 100%
rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/system/fvSchemes
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/fvSchemes
diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/system/fvSolution b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/fvSolution
similarity index 100%
rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/system/fvSolution
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/fvSolution
diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/system/sets.setSet b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/sets.setSet
similarity index 100%
rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/system/sets.setSet
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/sets.setSet
diff --git a/wmake/rules/General/cint b/wmake/rules/General/cint
deleted file mode 100644
index f09d622977..0000000000
--- a/wmake/rules/General/cint
+++ /dev/null
@@ -1,12 +0,0 @@
-.SUFFIXES: .ldf
-
-ifeq ($(origin WM_SCHEDULER), undefined)
-    EVAL_LDF = eval
-else
-    EVAL_LDF = $(WM_SCHEDULER)
-endif
-
-ldftoo = $(EVAL_LDF) m4 $$SOURCE \> $*.H \; cint -n$*.C -N$(*F) -p -c-1 -A -I${CINTSYSDIR}/inc -I${WM_PROJECT_DIR}/src/OpenFOAM/lnInclude -D__MAKECINT__ -DG__MAKECINT  -DG__SHAREDLIB -DG__OSFDLL -DG__ANSI -DG__ERRORCALLBACK -DG__SIGNEDCHAR -DG__NEWSTDHEADER -DG__CINT_VER6 -DG__NATIVELONGLONG -DG__P2FCAST -DG__STD_EXCEPTION -DG__HAVE_CONFIG -DG__NOMAKEINFO -DDP -D__restrict__= -Y0 -DNoInline $*.H \; $(CC) $(c++FLAGS) -c $*.C -o $@
-
-.ldf.dep:
-	$(MAKE_DEP)
diff --git a/wmake/rules/SiCortex64Gcc/general b/wmake/rules/SiCortex64Gcc/general
index 11b48acc3f..d70a77cdb0 100644
--- a/wmake/rules/SiCortex64Gcc/general
+++ b/wmake/rules/SiCortex64Gcc/general
@@ -8,4 +8,3 @@ include $(GENERAL_RULES)/standard
 include $(RULES)/X
 include $(RULES)/c
 include $(RULES)/c++
-include $(GENERAL_RULES)/cint
diff --git a/wmake/rules/SunOS64Gcc/general b/wmake/rules/SunOS64Gcc/general
index 70ee588d82..f9b5632198 100644
--- a/wmake/rules/SunOS64Gcc/general
+++ b/wmake/rules/SunOS64Gcc/general
@@ -1,11 +1,10 @@
 CPP        = /lib/cpp $(GFLAGS)
 LD         = ld -64
 
-PROJECT_LIBS = -l$(WM_PROJECT) -liberty -lnsl -lsocket -L$(FOAM_LIBBIN)/dummy -lPstream 
+PROJECT_LIBS = -l$(WM_PROJECT) -liberty -lnsl -lsocket -L$(FOAM_LIBBIN)/dummy -lPstream
 
 include $(GENERAL_RULES)/standard
 
 include $(RULES)/X
 include $(RULES)/c
 include $(RULES)/c++
-include $(GENERAL_RULES)/cint
diff --git a/wmake/rules/linux64Gcc/c++ b/wmake/rules/linux64Gcc/c++
index 36b5c29b20..9d074e2715 100644
--- a/wmake/rules/linux64Gcc/c++
+++ b/wmake/rules/linux64Gcc/c++
@@ -1,6 +1,6 @@
 .SUFFIXES: .C .cxx .cc .cpp
 
-c++WARN     = -Wall -Wno-strict-aliasing -Wextra -Wno-unused-parameter -Wold-style-cast
+c++WARN     = -Wall -Wno-strict-aliasing -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor
 
 CC          = g++ -m64
 
diff --git a/wmake/rules/linux64Gcc/general b/wmake/rules/linux64Gcc/general
index 3c2e4db2ee..10237bd1b6 100644
--- a/wmake/rules/linux64Gcc/general
+++ b/wmake/rules/linux64Gcc/general
@@ -8,4 +8,3 @@ include $(GENERAL_RULES)/standard
 include $(RULES)/X
 include $(RULES)/c
 include $(RULES)/c++
-include $(GENERAL_RULES)/cint
diff --git a/wmake/rules/linux64Gcc42/general b/wmake/rules/linux64Gcc42/general
index 11b48acc3f..d70a77cdb0 100644
--- a/wmake/rules/linux64Gcc42/general
+++ b/wmake/rules/linux64Gcc42/general
@@ -8,4 +8,3 @@ include $(GENERAL_RULES)/standard
 include $(RULES)/X
 include $(RULES)/c
 include $(RULES)/c++
-include $(GENERAL_RULES)/cint
diff --git a/wmake/rules/linux64Gcc43/general b/wmake/rules/linux64Gcc43/general
index 3c2e4db2ee..10237bd1b6 100644
--- a/wmake/rules/linux64Gcc43/general
+++ b/wmake/rules/linux64Gcc43/general
@@ -8,4 +8,3 @@ include $(GENERAL_RULES)/standard
 include $(RULES)/X
 include $(RULES)/c
 include $(RULES)/c++
-include $(GENERAL_RULES)/cint
diff --git a/wmake/rules/linuxGcc/general b/wmake/rules/linuxGcc/general
index d009001a6e..02ad6973ff 100644
--- a/wmake/rules/linuxGcc/general
+++ b/wmake/rules/linuxGcc/general
@@ -8,4 +8,3 @@ include $(GENERAL_RULES)/standard
 include $(RULES)/X
 include $(RULES)/c
 include $(RULES)/c++
-include $(GENERAL_RULES)/cint
diff --git a/wmake/rules/linuxGcc43/general b/wmake/rules/linuxGcc43/general
index d009001a6e..02ad6973ff 100644
--- a/wmake/rules/linuxGcc43/general
+++ b/wmake/rules/linuxGcc43/general
@@ -8,4 +8,3 @@ include $(GENERAL_RULES)/standard
 include $(RULES)/X
 include $(RULES)/c
 include $(RULES)/c++
-include $(GENERAL_RULES)/cint
diff --git a/wmake/rules/linuxPPC64Gcc/general b/wmake/rules/linuxPPC64Gcc/general
index 2626ab65d1..76d507634a 100644
--- a/wmake/rules/linuxPPC64Gcc/general
+++ b/wmake/rules/linuxPPC64Gcc/general
@@ -8,4 +8,3 @@ include $(GENERAL_RULES)/standard
 include $(RULES)/X
 include $(RULES)/c
 include $(RULES)/c++
-include $(GENERAL_RULES)/cint