Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -rbe1f6ba8f58abfe098865c85ebca070eb0dde6ce -r289696b3b5e15120cfecbe447ff45ef093959056
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision be1f6ba8f58abfe098865c85ebca070eb0dde6ce)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 289696b3b5e15120cfecbe447ff45ef093959056)
@@ -21,13 +21,13 @@
 #include "CpldInterface.h"
 #include "FpgaTD.h"
 #include "Messaging.h"
-#include "ModeTxParams.h"
 #include "OperationModes.h"
 #include "PersistentAlarm.h"
 #include "PIControllers.h"
 #include "Pressures.h"
 #include "TaskGeneral.h"
 #include "Timers.h"
+#include "TxParams.h"
 #include "Utilities.h"
 
 /**
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r927c47388ab6bd716b857f76e2026c116dd52e69 -r289696b3b5e15120cfecbe447ff45ef093959056
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 927c47388ab6bd716b857f76e2026c116dd52e69)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 289696b3b5e15120cfecbe447ff45ef093959056)
@@ -22,11 +22,11 @@
 #include "Messaging.h"
 #include "ModePreTreat.h"
 #include "ModeTreatment.h"
-#include "ModeTxParams.h"
 #include "ModeStandby.h"
 #include "OperationModes.h"
 #include "Switches.h"
 #include "SystemCommTD.h"
+#include "TxParams.h"
 
 /**
  *  @addtogroup TDStandbyMode
@@ -249,7 +249,6 @@
 //        PRESSURE_LIMIT_CHANGE_RESPONSE_T respRecord = { TRUE, REQUEST_REJECT_REASON_NONE, 0, 0, 0 };
 
         // Initialize treatment modes before starting a new treatment
-        initTreatParamsMode();
         initPreTreatmentMode();
         initTreatmentMode();
 //        initPostTreatmentMode();
@@ -260,7 +259,7 @@
 //        respRecord.venPresLimitAsymmetricmmHg = getTreatmentParameterS32DefaultValue( TREATMENT_PARAM_VEN_PRES_LIMIT_ASYMMETRIC );
 //        sendPressureLimitsChangeResponse( &respRecord );
         // Start treatment workflow with treatment parameters mode
-        requestNewOperationMode( MODE_TPAR );
+        //requestNewOperationMode( MODE_TPAR );
         treatStartReqReceived = FALSE;
     }
 
@@ -318,7 +317,7 @@
         }
         else if ( USER_COMMAND_CANCEL == cmd )
         {
-            result = signalUserCancelTreatment();
+            //result = signalUserCancelTreatment();
             if ( result != TRUE )
             {
                 rejReason = REQUEST_REJECT_REASON_NOT_ALLOWED_IN_CURRENT_MODE;
Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r98e57204871b1457f4e451c3d8a81835cd7e74a2 -r289696b3b5e15120cfecbe447ff45ef093959056
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 98e57204871b1457f4e451c3d8a81835cd7e74a2)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 289696b3b5e15120cfecbe447ff45ef093959056)
@@ -22,14 +22,14 @@
 #include "DDInterface.h"
 #include "ModeService.h"
 #include "ModeTreatment.h"
-#include "ModeTxParams.h"
 //#include "NVDataMgmt.h"
 #include "OperationModes.h"
 #include "StateTxDialysis.h"
 #include "StateTxPaused.h"
 //#include "Switches.h"
 #include "TaskGeneral.h"
 #include "Timers.h"
+#include "TxParams.h"
 #include "Valves.h"
 
 /**
Fisheye: Tag 289696b3b5e15120cfecbe447ff45ef093959056 refers to a dead (removed) revision in file `firmware/App/Modes/ModeTxParams.c'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 289696b3b5e15120cfecbe447ff45ef093959056 refers to a dead (removed) revision in file `firmware/App/Modes/ModeTxParams.h'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -rb89d157b56dce2daf63f4a9e9df9ef6636f2bf44 -r289696b3b5e15120cfecbe447ff45ef093959056
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision b89d157b56dce2daf63f4a9e9df9ef6636f2bf44)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 289696b3b5e15120cfecbe447ff45ef093959056)
@@ -22,14 +22,14 @@
 #include "ModeService.h"
 #include "ModeFault.h"
 #include "ModeStandby.h"
-#include "ModeTxParams.h"
 #include "ModePreTreat.h"
 #include "ModeTreatment.h"
 //#include "ModePostTreat.h"
 //#include "NVDataMgmt.h"
 #include "OperationModes.h"
 #include "TaskGeneral.h"
 #include "Timers.h"
+#include "TxParams.h"
 
 /**
  *  @addtogroup TDOperationModes
@@ -72,15 +72,14 @@
 
 /// This matrix determines legal transitions from one mode to another
 static const TD_OP_MODE_T MODE_TRANSITION_TABLE[ NUM_OF_MODES - 1 ][ NUM_OF_MODES - 1 ] = {
-// From    to->    FAULT    SERVICE      INIT      STANBY   TRT.PARAMS PRE-TREAT  TREATMENT  POST_TREA
-/* FAUL     */{ MODE_FAUL, MODE_SERV, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, },
-/* SERV     */{ MODE_NLEG, MODE_SERV, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, },
-/* INIT     */{ MODE_FAUL, MODE_NLEG, MODE_INIT, MODE_STAN, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, },
-/* STAN     */{ MODE_FAUL, MODE_SERV, MODE_INIT, MODE_STAN, MODE_TPAR, MODE_NLEG, MODE_NLEG, MODE_NLEG, },
-/* TPAR     */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_STAN, MODE_TPAR, MODE_PRET, MODE_NLEG, MODE_NLEG, },
-/* PRET     */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_STAN, MODE_NLEG, MODE_PRET, MODE_TREA, MODE_POST, },
-/* TREA     */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_TREA, MODE_POST, },
-/* POST     */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_STAN, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_POST, }, };
+// From    to->    FAULT    SERVICE      INIT      STANBY    PRE-TREAT  TREATMENT  POST_TREA
+/* FAUL     */{ MODE_FAUL, MODE_SERV, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, },
+/* SERV     */{ MODE_NLEG, MODE_SERV, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, },
+/* INIT     */{ MODE_FAUL, MODE_NLEG, MODE_INIT, MODE_STAN, MODE_NLEG, MODE_NLEG, MODE_NLEG, },
+/* STAN     */{ MODE_FAUL, MODE_SERV, MODE_INIT, MODE_STAN, MODE_NLEG, MODE_NLEG, MODE_NLEG, },
+/* PRET     */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_STAN, MODE_PRET, MODE_TREA, MODE_POST, },
+/* TREA     */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_TREA, MODE_POST, },
+/* POST     */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_STAN, MODE_NLEG, MODE_NLEG, MODE_POST, }, };
 
 // ********** private function prototypes **********
 
@@ -124,7 +123,6 @@
     initServiceMode();
     initInitAndPOSTMode();
     initStandbyMode();
-    initTreatParamsMode();
 //    initPreTreatmentMode();
     initTreatmentMode();
 //    initPostTreatmentMode();
@@ -203,10 +201,6 @@
             currentSubMode = execStandbyMode();
             break;
 
-        case MODE_TPAR:
-            currentSubMode = execTreatParamsMode();
-            break;
-
         case MODE_PRET:
             currentSubMode = execPreTreatmentMode();
             break;
@@ -326,9 +320,6 @@
         case MODE_STAN:
             signalAlarmActionToStandbyMode( action );
             break;
-        case MODE_TPAR:
-            signalAlarmActionToTreatParamsMode( action );
-            break;
 //        case MODE_PRET:
 //            signalAlarmActionToPreTreatmentMode( action );
 //            break;
@@ -412,9 +403,6 @@
         case MODE_STAN:
             currentSubMode = transitionToStandbyMode();
             break;
-        case MODE_TPAR:
-            currentSubMode = transitionToTreatParamsMode();
-            break;
         case MODE_PRET:
             currentSubMode = transitionToPreTreatmentMode();
             break;
Index: firmware/App/Modes/StateTxDialysis.c
===================================================================
diff -u -r50f4b79164155c1bc375dd3ff0e8588f934dc729 -r289696b3b5e15120cfecbe447ff45ef093959056
--- firmware/App/Modes/StateTxDialysis.c	(.../StateTxDialysis.c)	(revision 50f4b79164155c1bc375dd3ff0e8588f934dc729)
+++ firmware/App/Modes/StateTxDialysis.c	(.../StateTxDialysis.c)	(revision 289696b3b5e15120cfecbe447ff45ef093959056)
@@ -22,12 +22,12 @@
 #include "DDInterface.h"
 #include "Messaging.h"
 #include "ModeTreatment.h"
-#include "ModeTxParams.h"
 //#include "NVDataMgmt.h"
 #include "OperationModes.h"
 #include "StateTxDialysis.h"
 #include "Switches.h"
 #include "TaskGeneral.h"
+#include "TxParams.h"
 #include "Valves.h"
 
 /**
Index: firmware/App/Modes/StateTxPaused.c
===================================================================
diff -u -r79a1bc916aaa25b696385e9b292bf6262bab6113 -r289696b3b5e15120cfecbe447ff45ef093959056
--- firmware/App/Modes/StateTxPaused.c	(.../StateTxPaused.c)	(revision 79a1bc916aaa25b696385e9b292bf6262bab6113)
+++ firmware/App/Modes/StateTxPaused.c	(.../StateTxPaused.c)	(revision 289696b3b5e15120cfecbe447ff45ef093959056)
@@ -22,13 +22,13 @@
 #include "DDInterface.h"
 #include "Messaging.h"
 #include "ModeTreatment.h"
-#include "ModeTxParams.h"
 //#include "NVDataMgmt.h"
 #include "OperationModes.h"
 #include "RotaryValve.h"
 #include "StateTxPaused.h"
 #include "Switches.h"
 #include "TaskGeneral.h"
+#include "TxParams.h"
 #include "Valves.h"
 #include "Valve3Way.h"
 
Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r9d11c51da60da3f8d2917433938a583f8a105318 -r289696b3b5e15120cfecbe447ff45ef093959056
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 9d11c51da60da3f8d2917433938a583f8a105318)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 289696b3b5e15120cfecbe447ff45ef093959056)
@@ -30,7 +30,6 @@
 #include "FpgaTD.h"
 #include "LevelSensors.h"
 #include "Messaging.h"
-#include "ModeTxParams.h"
 #include "ModeStandby.h"
 #include "OperationModes.h"
 #include "PAL.h"
@@ -41,6 +40,7 @@
 #include "Switches.h"
 #include "SystemCommTD.h"
 #include "Temperatures.h"
+#include "TxParams.h"
 #include "Utilities.h"
 #include "Valve3Way.h"
 #include "Valves.h"
Index: firmware/App/Services/TxParams.c
===================================================================
diff -u -rb235eaec221c0e56482f640cf374111daa34119f -r289696b3b5e15120cfecbe447ff45ef093959056
--- firmware/App/Services/TxParams.c	(.../TxParams.c)	(revision b235eaec221c0e56482f640cf374111daa34119f)
+++ firmware/App/Services/TxParams.c	(.../TxParams.c)	(revision 289696b3b5e15120cfecbe447ff45ef093959056)
@@ -705,20 +705,6 @@
 
 /*********************************************************************//**
  * @brief
- * The signalAlarmActionToTreatParamsMode function executes the given alarm action
- * as appropriate while in Treatment Parameters Mode.
- * @details \b Inputs: none
- * @details \b Outputs: given alarm action executed
- * @param action ID of alarm action to execute
- * @return none
- *************************************************************************/
-void signalAlarmActionToTreatParamsMode( ALARM_ACTION_T action )
-{
-    // No special handling of alarm actions in this mode.
-}
-
-/*********************************************************************//**
- * @brief
  * The extractTreatmentParamsFromPayload function extracts the individual
  * treatment parameters received from the UI into a staging array where
  * they will be validated and stay until user confirms them.
@@ -1222,5 +1208,4 @@
     return result;
 }
 
-
 /**@}*/
Index: firmware/App/Services/TxParams.h
===================================================================
diff -u -rb235eaec221c0e56482f640cf374111daa34119f -r289696b3b5e15120cfecbe447ff45ef093959056
--- firmware/App/Services/TxParams.h	(.../TxParams.h)	(revision b235eaec221c0e56482f640cf374111daa34119f)
+++ firmware/App/Services/TxParams.h	(.../TxParams.h)	(revision 289696b3b5e15120cfecbe447ff45ef093959056)
@@ -95,7 +95,6 @@
 
 void resetTreatmentParameters( void );                                              // Reset all parameters to defaults
 BOOL signalUserConfirmationOfTreatmentParameters( MESSAGE_T *message );             // Process UI confirm/reject Treatment  parameters
-void signalAlarmActionToTreatParamsMode( ALARM_ACTION_T action );                   // Execute alarm action as appropriate for treatment parameters mode
 
 BOOL getValidTreatParamsReceived( void );                                           // Determine whether valid Treatment Parameters exist
 BOOL getTreatParamsConfirmed( void );                                               // Determine whether user confirmed the parameters