diff --git a/applications/solvers/incompressible/simpleFoam/windSimpleFoam/UEqn.H b/applications/solvers/incompressible/simpleFoam/windSimpleFoam/UEqn.H
index dc4d5655cf846b7aa874876cac0a6eda712f68d6..45fc95065b15b4bf90adcfda99bfa5b196352134 100644
--- a/applications/solvers/incompressible/simpleFoam/windSimpleFoam/UEqn.H
+++ b/applications/solvers/incompressible/simpleFoam/windSimpleFoam/UEqn.H
@@ -6,9 +6,9 @@
       + turbulence->divDevReff(U)
     );
 
-    UEqn().relax();
-
     // Add resistance on the actuation disks
     actuationDisks.addSu(UEqn());
 
+    UEqn().relax();
+
     solve(UEqn() == -fvc::grad(p));
diff --git a/src/lagrangian/coalCombustion/coalParcel/makeCoalParcelSubmodels.C b/src/lagrangian/coalCombustion/coalParcel/makeCoalParcelSubmodels.C
index ee17dd7e3cad16d131e00609d03b11164a86ad31..eee987f560dfa40a56bfaf029378e14e9fc373e4 100644
--- a/src/lagrangian/coalCombustion/coalParcel/makeCoalParcelSubmodels.C
+++ b/src/lagrangian/coalCombustion/coalParcel/makeCoalParcelSubmodels.C
@@ -24,51 +24,12 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "coalCloud.H"
-
-#include "makeParcelCloudFunctionObjects.H"
-
-// Kinematic
-#include "makeThermoParcelForces.H" // thermo variant
-#include "makeParcelDispersionModels.H"
-#include "makeReactingMultiphaseParcelInjectionModels.H" // MP variant
-#include "makeParcelPatchInteractionModels.H"
-
-// Thermodynamic
-#include "makeParcelHeatTransferModels.H"
-
-// Reacting
-#include "makeReactingMultiphaseParcelCompositionModels.H" // MP variant
-#include "makeReactingParcelPhaseChangeModels.H"
-#include "makeReactingParcelSurfaceFilmModels.H"
-
-// Reacting multiphase
-#include "makeReactingMultiphaseParcelDevolatilisationModels.H"
-
-// Coal specific
 #include "makeCoalParcelSurfaceReactionModels.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    makeParcelCloudFunctionObjects(coalCloud);
-
-    // Kinematic sub-models
-    makeThermoParcelForces(coalCloud);
-    makeParcelDispersionModels(coalCloud);
-    makeReactingMultiphaseParcelInjectionModels(coalCloud);
-    makeParcelPatchInteractionModels(coalCloud);
-
-    // Thermo sub-models
-    makeParcelHeatTransferModels(coalCloud);
-
-    // Reacting sub-models
-    makeReactingMultiphaseParcelCompositionModels(coalCloud);
-    makeReactingParcelPhaseChangeModels(coalCloud);
-
-    // Reacting multiphase sub-models
-    makeReactingMultiphaseParcelDevolatilisationModels(coalCloud);
-    makeReactingParcelSurfaceFilmModels(coalCloud);
     makeCoalParcelSurfaceReactionModels(coalCloud);
 }
 
diff --git a/src/lagrangian/coalCombustion/include/makeCoalParcelSurfaceReactionModels.H b/src/lagrangian/coalCombustion/include/makeCoalParcelSurfaceReactionModels.H
index 781f0c6d4714c61be48e278efbb7e6dd6e02fa75..cfdf74b5b0648246a1d400ea4ddf945f11e3f3b2 100644
--- a/src/lagrangian/coalCombustion/include/makeCoalParcelSurfaceReactionModels.H
+++ b/src/lagrangian/coalCombustion/include/makeCoalParcelSurfaceReactionModels.H
@@ -37,8 +37,6 @@ License
 
 #define makeCoalParcelSurfaceReactionModels(CloudType)                        \
                                                                               \
-    makeSurfaceReactionModel(CloudType);                                      \
-    makeSurfaceReactionModelType(NoSurfaceReaction, CloudType);               \
     makeSurfaceReactionModelType(COxidationDiffusionLimitedRate, CloudType);  \
     makeSurfaceReactionModelType                                              \
     (                                                                         \
diff --git a/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.H b/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.H
index 54dc027235e84b6791c193e5d94b4ab10d2a4a5e..71c88a37b4d32b245f7d37b6254ff43eccf23dae 100644
--- a/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.H
+++ b/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.H
@@ -327,17 +327,6 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define defineParcelTypeNameAndDebug(Type, DebugSwitch)                       \
-    template<>                                                                \
-    const Foam::word DsmcParcel<Type>::typeName(#Type);                       \
-    template<>                                                                \
-    int DsmcParcel<Type>::debug                                               \
-    (                                                                         \
-        Foam::debug::debugSwitch(#Type, DebugSwitch)                          \
-    );
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 #ifdef NoRepository
     #include "DsmcParcel.C"
 #endif
diff --git a/src/lagrangian/dsmc/parcels/derived/dsmcParcel/dsmcParcel.C b/src/lagrangian/dsmc/parcels/derived/dsmcParcel/dsmcParcel.C
index c05fb93aedcf7659502e55279b51069c687c9389..704541f4f019a0342bc9d42c5d54bbc40902ae86 100644
--- a/src/lagrangian/dsmc/parcels/derived/dsmcParcel/dsmcParcel.C
+++ b/src/lagrangian/dsmc/parcels/derived/dsmcParcel/dsmcParcel.C
@@ -31,7 +31,6 @@ namespace Foam
 {
 //    defineTypeNameAndDebug(dsmcParcel, 0);
 //    defineParticleTypeNameAndDebug(dsmcParcel, 0);
-//    defineParcelTypeNameAndDebug(dsmcParcel, 0);
 }
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
index 7e3785ded37a631eaf07be9f3a16504fa12d1606..7b2f8268f48fce1cfd175a6fd865d84a09baacd3 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
@@ -687,17 +687,6 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define defineParcelTypeNameAndDebug(Type, DebugSwitch)                       \
-    template<>                                                                \
-    const Foam::word KinematicParcel<Type>::typeName(#Type);                  \
-    template<>                                                                \
-    int KinematicParcel<Type>::debug                                          \
-    (                                                                         \
-        Foam::debug::debugSwitch(#Type, DebugSwitch)                          \
-    );
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 #ifdef NoRepository
     #include "KinematicParcel.C"
 #endif
diff --git a/wmake/rules/linux64Icc/c++Opt b/wmake/rules/linux64Icc/c++Opt
index c5a519aac9757eb3bfdc0e1df2a919f4cd352a74..28a17f783cae1846508385ed35e278b34e6cea64 100644
--- a/wmake/rules/linux64Icc/c++Opt
+++ b/wmake/rules/linux64Icc/c++Opt
@@ -1,2 +1,3 @@
 c++DBUG     =
-c++OPT      = -xSSE3 -O3 -no-prec-div
+#c++OPT      = -xSSE3 -O3 -no-prec-div
+c++OPT      = -xSSE3 -O1 -no-prec-div