Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r4e8a27d276ec5abfd96a6730ec6d78a821b57576 -r32df017beb715408e7eb1d2097d12f0c83638427
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 4e8a27d276ec5abfd96a6730ec6d78a821b57576)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 32df017beb715408e7eb1d2097d12f0c83638427)
@@ -19,7 +19,7 @@
 #include "AirTrap.h"
 #include "BloodFlow.h"
 #include "Buttons.h"
-#include "DrySelfTests.h"
+//#include "DrySelfTests.h"
 #include "DDInterface.h"
 #include "Messaging.h"
 #include "ModePreTreat.h"
@@ -101,7 +101,7 @@
         0
     };
     initPreTxHeparinSetup();
-    initDrySelfTests();
+    //initDrySelfTests();
 }
 
 /*********************************************************************//**
@@ -230,7 +230,7 @@
             break;
 
         case TD_PRE_TREATMENT_SELF_TEST_DRY_STATE:
-            transitionToDrySelfTests();
+            //transitionToDrySelfTests();
             break;
 
         case TD_PRE_TREATMENT_PRIME_STATE:
@@ -308,10 +308,10 @@
     if ( TRUE == alarmActionResumeReceived )
     {
         alarmActionResumeReceived = FALSE;
-        signalResumeDrySelfTests();
+        //signalResumeDrySelfTests();
     }
 
-    execDrySelfTests();
+    //execDrySelfTests();
 
     // Handle install request to failure path
     if ( TRUE == goToInstallStateRequested )
@@ -321,7 +321,7 @@
         state = TD_PRE_TREATMENT_TUBING_SET_INSTALL_STATE;
     }
 
-    if ( DRY_SELF_TESTS_COMPLETE_STATE == getDrySelfTestsState() )
+    //if ( DRY_SELF_TESTS_COMPLETE_STATE == getDrySelfTestsState() )
     {
         if ( submodeCompleteTransitionTimeCounter++ >= SUBMODE_COMPLETE_UI_TRANSITION_TIME_COUNT )
         {
@@ -592,7 +592,7 @@
         case ALARM_ACTION_RESUME:
             if ( TD_PRE_TREATMENT_SELF_TEST_DRY_STATE == currentPreTreatmentState )
             {
-               signalResumeDrySelfTests();
+               //signalResumeDrySelfTests();
             }
             else if ( TD_PRE_TREATMENT_RECIRCULATE_STATE == currentPreTreatmentState )
             {
@@ -658,7 +658,7 @@
 
         payload.mSubMode = (U32)currentPreTreatmentState;
         payload.mInstallState = (U32)getTubeSetInstallState();
-        payload.mSelfTestDryState = getDrySelfTestsState();
+        //payload.mSelfTestDryState = getDrySelfTestsState();
         payload.mPrimeState = 0;
         payload.mRecirculateState = getPreTxRecirculateState();
         payload.mConfirmRxState = 0;
Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r3f325a9fe7cbfb660a3ddf274d471d635266c586 -r32df017beb715408e7eb1d2097d12f0c83638427
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 3f325a9fe7cbfb660a3ddf274d471d635266c586)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 32df017beb715408e7eb1d2097d12f0c83638427)
@@ -26,7 +26,7 @@
 #include "Compatible.h"
 #include "CpldInterface.h"
 #include "DDInterface.h"
-#include "DrySelfTests.h"
+//#include "DrySelfTests.h"
 #include "Ejector.h"
 #include "FluidBolus.h"
 #include "FpgaTD.h"
@@ -138,7 +138,7 @@
     { MSG_ID_UI_TREATMENT_SET_POINT_DIALYSATE_TEMP_CHANGE_REQUEST,      &validateAndSetDialysateTemperature },
     { MSG_ID_UI_BLOOD_PRIME_CMD_REQUEST,                                &bloodPrimeHandleCmdRequest },
     { MSG_ID_UI_TREATMENT_SET_POINT_BLOOD_FLOW_CHANGE_REQUEST,          &bloodPrimeHandleBloodFlowChangeRequest },
-    { MSG_ID_UI_TUBE_SET_AUTHENTICATION_ACK_RESPONSE,                   &drySelfTestHandleTubingSetAuthResponse },
+//    { MSG_ID_UI_TUBE_SET_AUTHENTICATION_ACK_RESPONSE,                   &drySelfTestHandleTubingSetAuthResponse },
     { MSG_ID_UI_ADJUST_DISPOSABLES_CONFIRM_REQUEST,                     &handleAutoLoadRequest },
     { MSG_ID_UI_SETUP_TUBING_SET_CONNECTIONS_CONFIRM_REQUEST,           &handleSetupTubingSetConnectionConfirmRequest },
     { MSG_ID_UI_ADJUST_DISPOSABLES_REMOVAL_CONFIRM_REQUEST,             &handleAutoEjectRequest },