Index: dialin/hd/alarms.py
===================================================================
diff -u -r1cafeb686c9382de454060c487a02265cb6468fc -rc034b74d1d2ec9469e89bb7e6d4cdac5e20f2124
--- dialin/hd/alarms.py	(.../alarms.py)	(revision 1cafeb686c9382de454060c487a02265cb6468fc)
+++ dialin/hd/alarms.py	(.../alarms.py)	(revision c034b74d1d2ec9469e89bb7e6d4cdac5e20f2124)
@@ -110,9 +110,8 @@
     def get_current_alarms_state(self):
         """
         Gets the current alarms state.
-        None, Low, Medium, or High
 
-        @return: (str) the current alarms state in text form.
+        @return: (int) the current alarms state.
         """
         return self.alarms_state
 
Index: dialin/hd/pretreatment.py
===================================================================
diff -u -r1cafeb686c9382de454060c487a02265cb6468fc -rc034b74d1d2ec9469e89bb7e6d4cdac5e20f2124
--- dialin/hd/pretreatment.py	(.../pretreatment.py)	(revision 1cafeb686c9382de454060c487a02265cb6468fc)
+++ dialin/hd/pretreatment.py	(.../pretreatment.py)	(revision c034b74d1d2ec9469e89bb7e6d4cdac5e20f2124)
@@ -238,31 +238,14 @@
         self.pre_treatment_patient_connection_state = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0]
 
-        if PreTreatmentSubModes.has_value(pt_submode):
-            self.pre_treatment_submode = PreTreatmentSubModes(pt_submode).value
+        self.pre_treatment_submode = pt_submode
+        self.pre_treatment_sample_water_state = pt_sw_state
+        self.pre_treatment_consumable_self_test_state = pt_consumable_st_state
+        self.pre_treatment_no_cart_self_test_state = pt_no_cart_st_state
+        self.pre_treatment_dry_self_test_state = pt_dry_st_state
+        self.pre_treatment_prime_state = pt_prime_state
+        self.pre_treatment_recirc_state = pt_recirc_state
 
-        if PreTreatmentSampleWaterStates.has_value(pt_sw_state):
-            self.pre_treatment_sample_water_state = PreTreatmentSampleWaterStates(pt_sw_state).value
-
-        if PreTreatmentConsumableSelfTestStates.has_value(pt_consumable_st_state):
-            self.pre_treatment_consumable_self_test_state = PreTreatmentConsumableSelfTestStates(
-                pt_consumable_st_state).value
-
-        if PreTreatmentNoCartSelfTestStates.has_value(pt_no_cart_st_state):
-            self.pre_treatment_no_cart_self_test_state = PreTreatmentNoCartSelfTestStates(pt_no_cart_st_state).value
-
-        if PreTreatmentDrySelfTestStates.has_value(pt_dry_st_state):
-            self.pre_treatment_dry_self_test_state = PreTreatmentDrySelfTestStates(pt_dry_st_state).value
-
-        if PreTreatmentDrySelfTestStates.has_value(pt_dry_st_state):
-            self.pre_treatment_dry_self_test_state = PreTreatmentDrySelfTestStates(pt_dry_st_state).value
-
-        if PreTreatmentPrimeStates.has_value(pt_prime_state):
-            self.pre_treatment_prime_state = PreTreatmentPrimeStates(pt_prime_state).value
-
-        if PreTreatmentRecircStates.has_value(pt_recirc_state):
-            self.pre_treatment_recirc_state = PreTreatmentRecircStates(pt_recirc_state).value
-
     @publish([
         "no_cart_self_test_timeout",
         "no_cart_self_test_time_countdown"