Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -rb1492eff71eab83d55456ad3520ccfd6cda06a77 -r74ffac3f87a1a03c1a4282d6a6ac9db8c9b1a432
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision b1492eff71eab83d55456ad3520ccfd6cda06a77)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 74ffac3f87a1a03c1a4282d6a6ac9db8c9b1a432)
@@ -363,12 +363,7 @@
  *************************************************************************/
 static F32 calcBloodFlow( void )
 {
-#ifndef PBA_ESTIMATION
     F32 artPres = getLongFilteredArterialPressure();
-#else
-    // TODO - temporary test code - remove later
-    F32 artPres = -200.0;
-#endif
     F32 rotSpd  = filteredBloodPumpSpeed / BP_GEAR_RATIO;
     U32 r       = getBloodPumpRotorCount();
     U32 rotCnt  = CAP( r, BP_MAX_ROTOR_COUNT_FOR_WEAR );
Index: firmware/App/HDCommon.h
===================================================================
diff -u -r254faac62b851c393c5df753eade2dc880b83247 -r74ffac3f87a1a03c1a4282d6a6ac9db8c9b1a432
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 254faac62b851c393c5df753eade2dc880b83247)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 74ffac3f87a1a03c1a4282d6a6ac9db8c9b1a432)
@@ -44,7 +44,6 @@
 //    #define EMC_TEST_BUILD                  1           // EMC test build - HD/DG run separately but connected, HD pumps toggle on/off w/ stop button
       #define DISABLE_WD_AND_SFTY_POST_TESTS  1           // Disable watchdog and safety shutdown POST tests
       #define DISABLE_UI_POST_TEST            1           // Disable the UI POST
-//    #define PBA_ESTIMATION                  1           // Estimate arterial pressure rather than look at PBA sensor  // Part of DVT build switch
 
       // TODO stays as a build switch until the calibration structure is updated with the build
       #define SKIP_CAL_CHECK                  1           // Implement software configuration