diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
index 516c62d4820d6b80c7d951ddee04cf59754bc0ca..42467d15d2740bd4685b94607c2253219145a472 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
@@ -502,14 +502,10 @@ template<class CloudType>
 void Foam::KinematicCloud<CloudType>::setParcelThermoProperties
 (
     parcelType& parcel,
-    const scalar lagrangianDt,
-    const bool fullyDescribed
+    const scalar lagrangianDt
 )
 {
-    if (!fullyDescribed)
-    {
-        parcel.rho() = constProps_.rho0();
-    }
+    parcel.rho() = constProps_.rho0();
 }
 
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
index 4b034d5f0864407716027ba62d2a59e7d3d02842..b35082d6e675d15f82e3245469c543456bf71e0b 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
@@ -490,8 +490,7 @@ public:
             void setParcelThermoProperties
             (
                 parcelType& parcel,
-                const scalar lagrangianDt,
-                const bool fullyDescribed
+                const scalar lagrangianDt
             );
 
             //- Check parcel properties
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
index b30cf742302d9be7670a0b9770d702b42c3baaf9..8d384b97bb7d938a1c2925e76a1057ca030c597f 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
@@ -225,20 +225,29 @@ Foam::ReactingCloud<CloudType>::~ReactingCloud()
 
 template<class CloudType>
 void Foam::ReactingCloud<CloudType>::setParcelThermoProperties
+(
+    parcelType& parcel,
+    const scalar lagrangianDt
+)
+{
+    CloudType::setParcelThermoProperties(parcel, lagrangianDt);
+
+    parcel.pc() = this->thermo().thermo().p()[parcel.cell()];
+    parcel.Y() = composition().YMixture0();
+}
+
+
+template<class CloudType>
+void Foam::ReactingCloud<CloudType>::checkParcelProperties
 (
     parcelType& parcel,
     const scalar lagrangianDt,
     const bool fullyDescribed
 )
 {
-    CloudType::setParcelThermoProperties(parcel, lagrangianDt, fullyDescribed);
+    CloudType::checkParcelProperties(parcel, lagrangianDt, fullyDescribed);
 
-    if (!fullyDescribed)
-    {
-        parcel.pc() = this->thermo().thermo().p()[parcel.cell()];
-        parcel.Y() = composition().YMixture0();
-    }
-    else
+    if (fullyDescribed)
     {
         checkSuppliedComposition
         (
@@ -253,18 +262,6 @@ void Foam::ReactingCloud<CloudType>::setParcelThermoProperties
 }
 
 
-template<class CloudType>
-void Foam::ReactingCloud<CloudType>::checkParcelProperties
-(
-    parcelType& parcel,
-    const scalar lagrangianDt,
-    const bool fullyDescribed
-)
-{
-    CloudType::checkParcelProperties(parcel, lagrangianDt, fullyDescribed);
-}
-
-
 template<class CloudType>
 void Foam::ReactingCloud<CloudType>::storeState()
 {
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
index c8a6295a32009af1f6dc8eabc69ed71c42986f2e..327d7064566b2af0d8066c79220e6ca852c5381b 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
@@ -271,8 +271,7 @@ public:
             void setParcelThermoProperties
             (
                 parcelType& parcel,
-                const scalar lagrangianDt,
-                const bool fullyDescribed
+                const scalar lagrangianDt
             );
 
             //- Check parcel properties
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
index 45f94d89280d4f446a94aa8831489ca19745668c..9813318ba1d9671513155d55ed00bd04e6010379 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
@@ -158,24 +158,37 @@ template<class CloudType>
 void Foam::ReactingMultiphaseCloud<CloudType>::setParcelThermoProperties
 (
     parcelType& parcel,
-    const scalar lagrangianDt,
-    const bool fullyDescribed
+    const scalar lagrangianDt
 )
 {
-    CloudType::setParcelThermoProperties(parcel, lagrangianDt, fullyDescribed);
+    CloudType::setParcelThermoProperties(parcel, lagrangianDt);
 
     label idGas = this->composition().idGas();
     label idLiquid = this->composition().idLiquid();
     label idSolid = this->composition().idSolid();
 
-    if (!fullyDescribed)
-    {
-        parcel.YGas() = this->composition().Y0(idGas);
-        parcel.YLiquid() = this->composition().Y0(idLiquid);
-        parcel.YSolid() = this->composition().Y0(idSolid);
-    }
-    else
+    parcel.YGas() = this->composition().Y0(idGas);
+    parcel.YLiquid() = this->composition().Y0(idLiquid);
+    parcel.YSolid() = this->composition().Y0(idSolid);
+}
+
+
+template<class CloudType>
+void Foam::ReactingMultiphaseCloud<CloudType>::checkParcelProperties
+(
+    parcelType& parcel,
+    const scalar lagrangianDt,
+    const bool fullyDescribed
+)
+{
+    CloudType::checkParcelProperties(parcel, lagrangianDt, fullyDescribed);
+
+    if (fullyDescribed)
     {
+        label idGas = this->composition().idGas();
+        label idLiquid = this->composition().idLiquid();
+        label idSolid = this->composition().idSolid();
+
         this->checkSuppliedComposition
         (
             parcel.YGas(),
@@ -198,18 +211,6 @@ void Foam::ReactingMultiphaseCloud<CloudType>::setParcelThermoProperties
 }
 
 
-template<class CloudType>
-void Foam::ReactingMultiphaseCloud<CloudType>::checkParcelProperties
-(
-    parcelType& parcel,
-    const scalar lagrangianDt,
-    const bool fullyDescribed
-)
-{
-    CloudType::checkParcelProperties(parcel, lagrangianDt, fullyDescribed);
-}
-
-
 template<class CloudType>
 void Foam::ReactingMultiphaseCloud<CloudType>::storeState()
 {
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
index 6e9e0ee77ac60ac06783f91dcd9cb306acbde5e0..2a480ee43df312a46ab4aeb09bebd3b8211d5616 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
@@ -244,8 +244,7 @@ public:
             void setParcelThermoProperties
             (
                 parcelType& parcel,
-                const scalar lagrangianDt,
-                const bool fullyDescribed
+                const scalar lagrangianDt
             );
 
             //- Check parcel properties
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
index 4615938187ffd7e7d9543a702b622ddfd143516d..81a14410a5982bfd0802a3c49a6e5646255322c7 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
@@ -237,17 +237,13 @@ template<class CloudType>
 void Foam::ThermoCloud<CloudType>::setParcelThermoProperties
 (
     parcelType& parcel,
-    const scalar lagrangianDt,
-    const bool fullyDescribed
+    const scalar lagrangianDt
 )
 {
-    CloudType::setParcelThermoProperties(parcel, lagrangianDt, fullyDescribed);
+    CloudType::setParcelThermoProperties(parcel, lagrangianDt);
 
-    if (!fullyDescribed)
-    {
-        parcel.T() = constProps_.T0();
-        parcel.Cp() = constProps_.Cp0();
-    }
+    parcel.T() = constProps_.T0();
+    parcel.Cp() = constProps_.Cp0();
 }
 
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
index f51ce04c8c728ccfd3712559ba35749a9924132e..241b80cc79ad95bfe0cd9f6f8ec2406c866dd928 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
@@ -285,8 +285,7 @@ public:
             void setParcelThermoProperties
             (
                 parcelType& parcel,
-                const scalar lagrangianDt,
-                const bool fullyDescribed
+                const scalar lagrangianDt
             );
 
             //- Check parcel properties
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index fadf3b26c5681864c380745cf516a4ab6ddfff89..ef23c82a2cc37be7e576032931312bb69d95b95b 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
@@ -593,7 +593,7 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
                 );
 
                 // Check/set new parcel thermo properties
-                cloud.setParcelThermoProperties(*pPtr, dt, fullyDescribed());
+                cloud.setParcelThermoProperties(*pPtr, dt);
 
                 // Assign new parcel properties in injection model
                 setProperties(parcelI, newParcels, timeInj, *pPtr);
@@ -702,7 +702,7 @@ void Foam::InjectionModel<CloudType>::injectSteadyState
             );
 
             // Check/set new parcel thermo properties
-            cloud.setParcelThermoProperties(*pPtr, 0.0, fullyDescribed());
+            cloud.setParcelThermoProperties(*pPtr, 0.0);
 
             // Assign new parcel properties in injection model
             setProperties(parcelI, newParcels, 0.0, *pPtr);
diff --git a/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloud.C b/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloud.C
index 6cb30fed269123d23142ffe2f0b3dc1a35cd1955..5b23717b71e0d6c41b63ab76765392ce1d35f3bc 100644
--- a/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloud.C
+++ b/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloud.C
@@ -161,23 +161,19 @@ template<class CloudType>
 void Foam::SprayCloud<CloudType>::setParcelThermoProperties
 (
     parcelType& parcel,
-    const scalar lagrangianDt,
-    const bool fullyDescribed
+    const scalar lagrangianDt
 )
 {
-    CloudType::setParcelThermoProperties(parcel, lagrangianDt, fullyDescribed);
+    CloudType::setParcelThermoProperties(parcel, lagrangianDt);
 
-    if (!fullyDescribed)
-    {
-        const liquidMixtureProperties& liqMix = this->composition().liquids();
+    const liquidMixtureProperties& liqMix = this->composition().liquids();
 
-        const scalarField& Y(parcel.Y());
-        scalarField X(liqMix.X(Y));
+    const scalarField& Y(parcel.Y());
+    scalarField X(liqMix.X(Y));
 
-        // override rho and Cp from constantProperties
-        parcel.Cp() = liqMix.Cp(parcel.pc(), parcel.T(), X);
-        parcel.rho() = liqMix.rho(parcel.pc(), parcel.T(), X);
-    }
+    // override rho and Cp from constantProperties
+    parcel.Cp() = liqMix.Cp(parcel.pc(), parcel.T(), X);
+    parcel.rho() = liqMix.rho(parcel.pc(), parcel.T(), X);
 }
 
 
diff --git a/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloud.H b/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloud.H
index 92f9210c6272b5a13061fca4306431ec8839c1e0..92c07a7bec970a1e96d988ec9123c5c4ce5ba1bd 100644
--- a/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloud.H
+++ b/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloud.H
@@ -213,8 +213,7 @@ public:
             void setParcelThermoProperties
             (
                 parcelType& parcel,
-                const scalar lagrangianDt,
-                const bool fullyDescribed
+                const scalar lagrangianDt
             );
 
             //- Check parcel properties