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;