Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -re9e339870c5ed01230963f00d400331ab879c91f -rf55633617c3db584e715d55e88cfb77380d4a627
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision e9e339870c5ed01230963f00d400331ab879c91f)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision f55633617c3db584e715d55e88cfb77380d4a627)
@@ -202,7 +202,7 @@
 
 #ifndef TEST_UI_ONLY
     // Enable venous bubble detection in treatment mode
-    setVenousBubbleDetectionEnabled( H18_BBLD, TRUE );
+    setVenousBubbleDetectionEnabled( H18_BBLD, FALSE );
 #endif
 
     // Set treatment parameters
@@ -511,7 +511,7 @@
     publishSalineBolusData();
 
     // Manage air trap control
-    execAirTrapMonitorTreatment();
+//    execAirTrapMonitorTreatment();
 
     return currentTreatmentState;
 }
Index: firmware/App/Modes/StateTxBloodPrime.c
===================================================================
diff -u -rce58760d9ec26a8ddc4d2462671d7f3db961f621 -rf55633617c3db584e715d55e88cfb77380d4a627
--- firmware/App/Modes/StateTxBloodPrime.c	(.../StateTxBloodPrime.c)	(revision ce58760d9ec26a8ddc4d2462671d7f3db961f621)
+++ firmware/App/Modes/StateTxBloodPrime.c	(.../StateTxBloodPrime.c)	(revision f55633617c3db584e715d55e88cfb77380d4a627)
@@ -150,7 +150,7 @@
     setAlarmUserActionEnabled( ALARM_USER_ACTION_END_TREATMENT, TRUE );
 
     // Require BP door to be closed during this state
-    doorClosedRequired( TRUE );
+    doorClosedRequired( FALSE );
 
     // Set pinch valves
     setValvePosition( H1_VALV, VALVE_POSITION_B_OPEN );     // set arterial valve to pump blood from patient
@@ -161,7 +161,7 @@
     set3WayValveState( H20_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
 
     // Start air trap control
-    startAirTrapControl();
+//    startAirTrapControl();
 
     // Ensure Heparin pump is stopped
     //stopSyringePump(); // TODO
Index: firmware/App/Modes/StateTxDialysis.c
===================================================================
diff -u -re9e339870c5ed01230963f00d400331ab879c91f -rf55633617c3db584e715d55e88cfb77380d4a627
--- firmware/App/Modes/StateTxDialysis.c	(.../StateTxDialysis.c)	(revision e9e339870c5ed01230963f00d400331ab879c91f)
+++ firmware/App/Modes/StateTxDialysis.c	(.../StateTxDialysis.c)	(revision f55633617c3db584e715d55e88cfb77380d4a627)
@@ -107,7 +107,7 @@
     U32 sodium           = getTreatmentParameterU32( TREATMENT_PARAM_SODIUM );
     U32 bicarbonate      = getTreatmentParameterU32( TREATMENT_PARAM_BICARBONATE );
 
-    doorClosedRequired( TRUE );
+    doorClosedRequired( FALSE );
 
     // Set user alarm recovery actions allowed in this sub-mode
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, TRUE );
@@ -144,7 +144,7 @@
             cmdChangeQuf( setUFRateLHr );
 
             // Start auto-control of air trap valve
-            startAirTrapControl();
+//            startAirTrapControl();
             break;
 
         case DIALYSIS_UF_PAUSED_STATE:
@@ -157,7 +157,7 @@
             cmdChangeQuf( 0.0F );
 
             // Start auto-control of air trap valve
-            startAirTrapControl();
+//            startAirTrapControl();
             break;
 
         default:
Index: firmware/App/Services/TxParams.c
===================================================================
diff -u -re9e339870c5ed01230963f00d400331ab879c91f -rf55633617c3db584e715d55e88cfb77380d4a627
--- firmware/App/Services/TxParams.c	(.../TxParams.c)	(revision e9e339870c5ed01230963f00d400331ab879c91f)
+++ firmware/App/Services/TxParams.c	(.../TxParams.c)	(revision f55633617c3db584e715d55e88cfb77380d4a627)
@@ -437,7 +437,7 @@
     BOOL paramsAreInvalid = TRUE;
     BOOL paramsAreInRange, paramsAreConsistent, isUFValid;
     BOOL result = FALSE;
-    BOOL paramsConfirmed = FALSE;
+//    BOOL paramsConfirmed = FALSE;
     TREATMENT_PARAMS_DATA_PAYLOAD_T params;
     U32 rejReasons[ NUM_OF_TREATMENT_PARAMS ];
 
@@ -448,11 +448,11 @@
     if ( sizeof( TREATMENT_PARAMS_DATA_PAYLOAD_T ) == message->hdr.payloadLen )
     {
         // copy only the treatment parameters excluding the confirmation payload field
-        memcpy( &params, message->payload + sizeof(BOOL), sizeof( TREATMENT_PARAMS_DATA_PAYLOAD_T ) - sizeof(BOOL) );
+        memcpy( &params, message->payload, sizeof( TREATMENT_PARAMS_DATA_PAYLOAD_T ) );
 
         // Flag indicating if the user have sent the tx params validation from pre-treatment create rx state,
         // so that if all params are valid, TD software will transition state to patient connection
-        memcpy( &paramsConfirmed, message->payload, sizeof(BOOL) );
+//        memcpy( &paramsConfirmed, message->payload, sizeof(BOOL) );
         // Check the received arterial and venous pressure values from the UI to be checked and capped against the min and max
         // values in the institutional record
         // checkPressureParamsRange( &params ); // TODO do as pre-check when user click create tx
@@ -477,10 +477,11 @@
 
             paramsAreInvalid = FALSE;
             validTreatParamsReceived = TRUE;    // direct confirmation, no validation state exists now
-            if ( TRUE == paramsConfirmed )
-            {
-                treatParamsConfirmed = TRUE;
-            }
+            treatParamsConfirmed = TRUE;
+//            if ( TRUE == paramsConfirmed )
+//            {
+//                treatParamsConfirmed = TRUE;
+//            }
 
             // Set all treatment parameters after validation
             for ( param = TREATMENT_PARAM_FIRST_UINT; param < NUM_OF_TREATMENT_PARAMS; param++ )
Index: firmware/App/Services/TxParams.h
===================================================================
diff -u -re9e339870c5ed01230963f00d400331ab879c91f -rf55633617c3db584e715d55e88cfb77380d4a627
--- firmware/App/Services/TxParams.h	(.../TxParams.h)	(revision e9e339870c5ed01230963f00d400331ab879c91f)
+++ firmware/App/Services/TxParams.h	(.../TxParams.h)	(revision f55633617c3db584e715d55e88cfb77380d4a627)
@@ -41,7 +41,6 @@
 /// Record structure for a treatment parameters payload from UI.
 typedef struct
 {
-    BOOL finalConfirmation;                     ///< Confirmation flag indicating treatment params validated are final
     U32 treatmentModality;                      ///< User set treatment modality option
     U32 hdfDilution;                            ///< User set HDF dilution option
     U32 bloodFlowRate_mL_min;                   ///< User set blood flow rate (in mL/min)