Index: leahi_dialin/common/td_defs.py
===================================================================
diff -u -r272d33ed055f9d107788a17a76f2b9bc5bb510aa -r99005b6f96d49ad13fa01a44889579c386dc803a
--- leahi_dialin/common/td_defs.py	(.../td_defs.py)	(revision 272d33ed055f9d107788a17a76f2b9bc5bb510aa)
+++ leahi_dialin/common/td_defs.py	(.../td_defs.py)	(revision 99005b6f96d49ad13fa01a44889579c386dc803a)
@@ -1437,23 +1437,11 @@
 
 @unique
 class TDUsageInformationRecordFields(RecordsBaseEnum):
-    RO_WATER_GEN_TOTAL_L                        = (0, DataTypes.F32)        # Total RO water generated in liters. (Cannot be reset)
-    RO_WATER_GEN_SINCE_LAST_SERVICE_L           = (1, DataTypes.F32)        # RO water generated since last treatment in liters
-    LAST_BASIC_FLUSH_COMPLETE_DATE_EPOCH        = (2, DataTypes.U32)        # Last basic flush complete date in epoch.
-    LAST_HEAT_DISINFECT_COMPLETE_DATE_EPOCH     = (3, DataTypes.U32)        # Last heat disinfect complete date in epoch.
-    LAST_HEAT_ACTIVE_COOL_COMPLETE_DATE_EPOCH   = (4, DataTypes.U32)        # Last heat disinfect active cool complete date in epoch.
-    LAST_FILTER_FLUSH_COMPLETE_DATE_EPOCH       = (5, DataTypes.U32)        # Last filter flush complete date in epoch.
-    LAST_RESET_TIME_EPOCH                       = (6, DataTypes.U32)        # Last time the record was reset in epoch.
-    NUM_OF_USAGE_INFO_RECORD_FIELDS             = (7, DataTypes.NONE)       # Number of Usage Information Record Fields
+    LAST_RESET_TIME_EPOCH           = (0, DataTypes.U32)                    # Last time the record was reset in epoch.
+    NUM_OF_USAGE_INFO_RECORD_FIELDS = (1, DataTypes.NONE)                   # Number of Usage Information Record Fields
 
 TDUsageInformationRecordFields._str_list = {
     # Official Name :               Accepted strings
-    'RO_WATER_GEN_TOTAL_L': [],
-    'RO_WATER_GEN_SINCE_LAST_SERVICE_L': [],
-    'LAST_BASIC_FLUSH_COMPLETE_DATE_EPOCH': [],
-    'LAST_HEAT_DISINFECT_COMPLETE_DATE_EPOCH': [],
-    'LAST_HEAT_ACTIVE_COOL_COMPLETE_DATE_EPOCH': [],
-    'LAST_FILTER_FLUSH_COMPLETE_DATE_EPOCH': [],
     'LAST_RESET_TIME_EPOCH': [],
     'NUM_OF_USAGE_INFO_RECORD_FIELDS': [],
 }