Index: suite_leahi/shared/scripts/names.py
===================================================================
diff -u -r0130028593cbcfc6ec7e97af4b4c48f26b96898b -r84fec1666e63db5d9cf5ab57113c467376aca2d6
--- suite_leahi/shared/scripts/names.py	(.../names.py)	(revision 0130028593cbcfc6ec7e97af4b4c48f26b96898b)
+++ suite_leahi/shared/scripts/names.py	(.../names.py)	(revision 84fec1666e63db5d9cf5ab57113c467376aca2d6)
@@ -233,11 +233,7 @@
 o_tmpWindow_LabelUnitValueAdjuster                                      = {"container": o_Overlay,                                                                                                                        "objectName": "_tmpWindow",                                                           "type": "LabelUnitValueAdjuster"                                                            }
 o_PreTreatmentSampleStack_button_TouchRect                              = {"container": o_preTreatmentStack_PreTreatmentSampleStack_PreTreatmentWaterSample, "id": "_button",                                                                                                                                   "type": "TouchRect",                                                  "unnamed": 1          }
 o_preTreatmentStack_repeater_Repeater                                   = {"container": o_preTreatmentStack_PreTreatmentStack,                               "id": "repeater",                                                                                                                                  "type": "Repeater",                                                   "unnamed": 1          }
-# o_preTreatmentStack_gridSteps_Grid                                  = {"container": o_preTreatmentStack_PreTreatmentStack, "id": "_gridSteps", "type": "Grid", "unnamed": 1, "visible": True}
-# o_preTreatmentStack_gridSteps_Grid_2 = {"container": o_preTreatmentStack_PreTreatmentStack, "id": "_gridSteps", "occurrence": 2, "type": "Grid", "unnamed": 1, "visible": True}
 o_PreTreatmentCreate_bpMeasurementIntervalControl_ValueAdjusterCustom = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,            "id": "_bpMeasurementIntervalControl",                                                                                                              "type": "ValueAdjusterCustom",                                        "unnamed": 1          }
-
-# o_preTreatmentStack_Validate_Text                                       = {"container": o_preTreatmentStack_PreTreatmentStack,                                                                                                                                                                                         "text": "Validate", "type": "Text", "unnamed": 1, "visible": True}
 o_notification_bar                                                      = {"container": o_Overlay,                                                                                                                       "objectName": "NotificationBar",                                                       "type": "NotificationBarSmall"                                                              }
 o_treatmentHome_editButton_IconButton                                   = {"container": mainTreatmentScreen,                                                     "id": "_editButton",                                                                                                                           "type": "IconButton",                                                "unnamed": 1           }
 o_treatmentHome_treatmentPressures_TreatmentPressures                   = {"container": mainTreatmentScreen,                                                                                                             "objectName": "treatmentPressures",                                                    "type": "TreatmentPressures"                                                                }
@@ -255,8 +251,6 @@
 o_timeElapsed_LabelUnitText                                             = {"container": o_Overlay,                                                                                                                       "objectName": "_timeElapsed",                                                          "type": "LabelUnitText"                                                                     }
 o_newTreatmentDuration_LabelUnitValueAdjuster                           = {"container": o_Overlay,                                                                                                                       "objectName": "_newTreatmentDuration",                                                 "type": "LabelUnitValueAdjuster"                                                            }
 o_preTreatmentStack_confirmButton_ConfirmButton                         = {"container": o_preTreatmentStack_PreTreatmentStack,                                                                                           "objectName": "_confirmButton",                                                        "type": "ConfirmButton"                                             , "visible": True       }
-# o_preTreatmentStack_titleBar_StepNavigationTitleBar                     = {"container": o_preTreatmentStack_PreTreatmentStack, "id": "_titleBar", "type": "StepNavigationTitleBar", "unnamed": 1}
-# o_preTreatmentStack_mouseArea_MouseArea                                 = {"container": o_preTreatmentStack_PreTreatmentStack, "id": "_mouseArea", "occurrence": 2, "type": "MouseArea", "unnamed": 1, "visible": True}
 o_ufRate_LabelUnitText                                                  = {"container": o_Overlay,                                                                                                                       "objectName": "_ufRate",                                                               "type": "LabelUnitText"                                                                     }
 o_newTreatmentDuration_LabelUnitText                                    = {"container": o_Overlay,                                                                                                                       "objectName": "_newTreatmentDuration",                                                 "type": "LabelUnitText"                                                                     }