Index: leahi_dialin/common/dd_defs.py
===================================================================
diff -u -r62640bb1dfcb4279d31719ca933c3ce69bfb46be -r0a1f091c869a5a2f68f06390fc35192a0eb7edbc
--- leahi_dialin/common/dd_defs.py	(.../dd_defs.py)	(revision 62640bb1dfcb4279d31719ca933c3ce69bfb46be)
+++ leahi_dialin/common/dd_defs.py	(.../dd_defs.py)	(revision 0a1f091c869a5a2f68f06390fc35192a0eb7edbc)
@@ -329,8 +329,7 @@
     D29_COND                    = 2                             # Water, Bicarbonate, and Acid Collective Conductivity Sensor
     D43_COND                    = 3                             # Self Test Conductivity Sensor (not used for dialysate conductivity)
     D74_COND                    = 4                             # Water and Bicarbonate Collective Conductivity Sensor
-    D98_COND                    = 5                             # D98 Conductivity Sensor
-    NUM_OF_CONDUCTIVITY_SENSORS = 6                             # Number of Conductivity Sensors
+    NUM_OF_CONDUCTIVITY_SENSORS = 5                             # Number of Conductivity Sensors
 
 DDConductivitySensorNames._str_list = {
     # Official Name :       Accepted strings
@@ -339,7 +338,6 @@
     'D29_COND': ['d29'],
     'D43_COND': ['d43'],
     'D74_COND': ['d74'],
-    'D98_COND': ['d98'],
     'NUM_OF_CONDUCTIVITY_SENSORS': []
 }
 
Index: leahi_dialin/dd/modules/conductivity_sensors.py
===================================================================
diff -u -r9636bffdc6b129ed07299d5bbf52056a31872769 -r0a1f091c869a5a2f68f06390fc35192a0eb7edbc
--- leahi_dialin/dd/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision 9636bffdc6b129ed07299d5bbf52056a31872769)
+++ leahi_dialin/dd/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision 0a1f091c869a5a2f68f06390fc35192a0eb7edbc)
@@ -54,8 +54,7 @@
             dd_enum_repository.DDConductivitySensorNames.D27_COND.name: 0.0,
             dd_enum_repository.DDConductivitySensorNames.D29_COND.name: 0.0,
             dd_enum_repository.DDConductivitySensorNames.D43_COND.name: 0.0,
-            dd_enum_repository.DDConductivitySensorNames.D74_COND.name: 0.0,
-            dd_enum_repository.DDConductivitySensorNames.D98_COND.name: 0.0
+            dd_enum_repository.DDConductivitySensorNames.D74_COND.name: 0.0
         }
 
         self.dd_conductivity_timestamp = 0.0
@@ -70,24 +69,20 @@
         @param message:  published DD conductivity sensor data message
         @return: None
         """
-        self.dd_conductivity[dd_enum_repository.DDConductivitySensorNames.D17_COND.name] = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
+        sensor_list =[]
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D17_COND, 'f'))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D27_COND, 'f'))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D29_COND, 'f'))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D43_COND, 'f'))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D74_COND, 'f'))
 
-        self.dd_conductivity[dd_enum_repository.DDConductivitySensorNames.D27_COND.name] = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
+        i = 1
+        for sensor in sensor_list:
+            start_pos = eval(f'MsgFieldPositions.START_POS_FIELD_{i}')
+            end_pos = eval(f'MsgFieldPositions.END_POS_FIELD_{i}')
+            self.dd_conductivity[sensor[0].name] = struct.unpack(sensor[1],bytearray(message['message'][start_pos:end_pos]))[0]
+            i += 1
 
-        self.dd_conductivity[dd_enum_repository.DDConductivitySensorNames.D29_COND.name] = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0]
-
-        self.dd_conductivity[dd_enum_repository.DDConductivitySensorNames.D43_COND.name] = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0]
-
-        self.dd_conductivity[dd_enum_repository.DDConductivitySensorNames.D74_COND.name] = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0]
-
-        self.dd_conductivity[dd_enum_repository.DDConductivitySensorNames.D98_COND.name] = struct.unpack('f', bytearray(
-                message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0]
-            
         self.dd_conductivity_timestamp = timestamp
 
 
Index: leahi_dialin/fp/proxies/dd_proxy.py
===================================================================
diff -u -rbd5420b3540747a01b3d4d6dd40146eab527e0d1 -r0a1f091c869a5a2f68f06390fc35192a0eb7edbc
--- leahi_dialin/fp/proxies/dd_proxy.py	(.../dd_proxy.py)	(revision bd5420b3540747a01b3d4d6dd40146eab527e0d1)
+++ leahi_dialin/fp/proxies/dd_proxy.py	(.../dd_proxy.py)	(revision 0a1f091c869a5a2f68f06390fc35192a0eb7edbc)
@@ -77,7 +77,6 @@
 
         @return: 1 if successful, zero otherwise
         """
-
         if not self._fp.fp_defeatured:
             self._fp.cmd_fp_set_operation_mode(4)
         else:
@@ -96,7 +95,6 @@
 
         @return: 1 if successful, zero otherwise
         """
-
         # Disable flush
         self._fp.test_configs.cmd_set_test_config(DDFPTestConfigOptions.TEST_CONFIG_FP_SKIP_PRE_GEN_FLUSH.value, 1)