diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/T b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/T
index 8fbb73eff0a77df2dfa7f1c74c43b77a3fc5c5b6..92fbe4aaac1a0b84bdf24d482a9f61a8a007b046 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/T
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/T
@@ -44,10 +44,6 @@ boundaryField
     {
         type            empty;
     }
-    "baffle1Wall.*"
-    {
-        type           calculated;
-    }
 }
 
 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/U b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/U
index 1cee83b6cf85af9d1fdbc2e3af652bf2f7e0f607..76239f12ddfe847696a49abb363e8b14db268d56 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/U
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/U
@@ -46,10 +46,6 @@ boundaryField
     {
         type            empty;
     }
-    "baffle1Wall.*"
-    {
-        type            calculated;
-    }
 }
 
 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/alphat b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/alphat
index 977203512af76a1a6b6069e46a79016ceed42041..3bc99dd80842ce5c24663ff2f90700cf992ae00b 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/alphat
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/alphat
@@ -45,10 +45,6 @@ boundaryField
     {
         type            empty;
     }
-    "baffle1Wall.*"
-    {
-        type            calculated;
-    }
 }
 
 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/epsilon b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/epsilon
index 21a6d42fa82dbd3969e667a7f6288a5454da2068..69f9ac68038d554c538eee00ace54ab86d56286d 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/epsilon
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/epsilon
@@ -44,10 +44,6 @@ boundaryField
     {
         type            empty;
     }
-    "baffle1Wall.*"
-    {
-         type           calculated;
-    }
 }
 
 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/k b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/k
index 5f4612566950433a4dea33c49bb15c141e422a22..9ecfe3d9f81f3c09d5318f3d6ff78f6185e7f19a 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/k
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/k
@@ -44,10 +44,6 @@ boundaryField
     {
         type            empty;
     }
-    "baffle1Wall.*"
-    {
-        type            calculated;
-    }
 }
 
 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/mut b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/mut
index 41310b7ced3210d164ec057f293a1e61f2a184c8..f83a004214fcb79130c0afe91bf098bb0afe6db9 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/mut
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/mut
@@ -45,10 +45,6 @@ boundaryField
     {
         type            empty;
     }
-    "baffle1Wall.*"
-    {
-        type           calculated;
-    }
 }
 
 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/p b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/p
index 8bbeb86853e72244e693f6d353a0f16019ac5ab1..d20b276591daa3df6405dd1118f665b4c7685e03 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/p
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/p
@@ -45,10 +45,6 @@ boundaryField
     {
         type            empty;
     }
-    "baffle1Wall.*"
-    {
-        type           calculated;
-    }
 }
 
 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/p_rgh b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/p_rgh
index 8cb7d58cdf5374a02b7f54e8539a5e3bb28102b8..26fa39b2553d6f9632bba0bfd73a4ec90aa02ca3 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/p_rgh
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/p_rgh
@@ -45,10 +45,6 @@ boundaryField
     {
         type            empty;
     }
-    "baffle1Wall.*"
-    {
-        type           calculated;
-    }
 }
 
 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/Allrun b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/Allrun
index ed131900d36d14e0bb34237f1e1e0b69976c65dc..e83f5f5977f2f59d124f2f3aa47d3b684f064161 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/Allrun
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/Allrun
@@ -13,15 +13,11 @@ unset FOAM_SETNAN
 unset FOAM_SIGFPE
 
 # Create first baffle
-runApplication createBaffles baffleFaces '(baffle1Wall_0 baffle1Wall_1)' -overwrite
+runApplication createBaffles -overwrite
 
 # Create region
 runApplication extrudeToRegionMesh -overwrite
 
-# Set the BC's for the baffle
-runApplication changeDictionary -dict system/changeDictionaryDict.baffle
-rm log.changeDictionary
-
 # Set Bc's for the region baffle
 runApplication changeDictionary -dict system/changeDictionaryDict.baffleRegion -literalRE
 rm log.changeDictionary
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/polyMesh/blockMeshDict
index b1def0a3a2e42d02ff5bce810435b744873b306b..4b273990da876a73e3b02cb3064bb706916b1b08 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/polyMesh/blockMeshDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/polyMesh/blockMeshDict
@@ -84,28 +84,6 @@ boundary
             (4 5 6 7)
         );
     }
-
-    baffle1Wall_0
-    {
-        type            mappedWall;
-        sampleMode      nearestPatchFace;
-        sampleRegion    region0;
-        samplePatch     baffle1Wall_1;
-        offsetMode      uniform;
-        offset          (0 0 0);
-        faces ();
-    }
-
-    baffle1Wall_1
-    {
-        type            mappedWall;
-        sampleMode      nearestPatchFace;
-        sampleRegion    region0;
-        samplePatch     baffle1Wall_0;
-        offsetMode      uniform;
-        offset          (0 0 0);
-        faces ();
-    }
 );
 
 mergePatchPairs
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/controlDict b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/controlDict
index ace5803d4970623cf854673b3d6f4855a412a984..acd337d87733d98406a88afc1b08b05124efa50f 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/controlDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/controlDict
@@ -44,6 +44,6 @@ timePrecision   6;
 
 runTimeModifiable true;
 
-libs ("libthermoBaffleModels.so");
+libs ("libthermoBaffleModels.so" "libcompressibleRASModels.so");
 
 // ************************************************************************* //