Index: shared/scripts/configuration/config.py
===================================================================
diff -u -r3037246670bc9f00dff0acc09f82b5aca6cd2bb8 -ra58d7af64baf37c4bc405ca01052bf066da7b892
--- shared/scripts/configuration/config.py	(.../config.py)	(revision 3037246670bc9f00dff0acc09f82b5aca6cd2bb8)
+++ shared/scripts/configuration/config.py	(.../config.py)	(revision a58d7af64baf37c4bc405ca01052bf066da7b892)
@@ -48,4 +48,3 @@
 
 
 
-
Index: shared/scripts/names.py
===================================================================
diff -u -r212a0fd3028f7369dca1ec6daa8e5880b2ff3d3f -ra58d7af64baf37c4bc405ca01052bf066da7b892
--- shared/scripts/names.py	(.../names.py)	(revision 212a0fd3028f7369dca1ec6daa8e5880b2ff3d3f)
+++ shared/scripts/names.py	(.../names.py)	(revision a58d7af64baf37c4bc405ca01052bf066da7b892)
@@ -96,9 +96,3 @@
 o_SettingsBase_usbFolderRectangle_Rectangle = {"container": o_SettingsBase_SettingsBase, "gradient": 0, "id": "_usbFolderRectangle", "type": "Rectangle", "unnamed": 1, "visible": True}
 o_SettingsBase_progressCircle_ProgressCircle_2 = {"container": o_SettingsBase_SettingsBase, "id": "_progressCircle", "occurrence": 2, "type": "ProgressCircle", "unnamed": 1, "visible": True}
 o_SettingsBase_image_Image = {"container": o_SettingsBase_SettingsBase, "id": "_image", "source": "qrc:/images/iEject", "type": "Image", "unnamed": 1, "visible": True}
-o_settings_text = {"container": o_Gui_MainView, "text": "Settings", "type": "Text", "unnamed": 1, "visible": True}
-o_service_text = {"container": o_Gui_MainView, "text": "Service", "type": "Text", "unnamed": 1, "visible": True}
-userConfirmation_UserConfirmation = {"container": o_Gui_MainView, "objectName": "UserConfirmation", "type": "UserConfirmation", "visible": True}
-o_input_password = {"container": userConfirmation_UserConfirmation, "echoMode": 2, "id": "_input", "passwordCharacter": "123", "type": "TextInput", "unnamed": 1, "visible": True}
-o_service_confirm_btn = {"container": userConfirmation_UserConfirmation, "text": "CONFIRM", "type": "Text", "unnamed": 1, "visible": True}
-o_service_back_btn = {"container": o_Gui_MainView, "type": "Text", "unnamed": 1, "visible": True}
Index: tst_settings_date_and_time/test.py
===================================================================
diff -u -r212a0fd3028f7369dca1ec6daa8e5880b2ff3d3f -ra58d7af64baf37c4bc405ca01052bf066da7b892
--- tst_settings_date_and_time/test.py	(.../test.py)	(revision 212a0fd3028f7369dca1ec6daa8e5880b2ff3d3f)
+++ tst_settings_date_and_time/test.py	(.../test.py)	(revision a58d7af64baf37c4bc405ca01052bf066da7b892)
@@ -45,8 +45,8 @@
 DG_DATE_AND_TIME_MESSAGE = "AdjustDGDateTime"
 SERVICE_SCREEN_OPTIONS = ["Information", "Volume And Brightness", "Wi-Fi", "Bluetooth Cuff", "DG Cleaning", "Set Date And Time", "Export Logs" ]
 EMPTY_INPUT_FIELD = ""
-SERVICE_PASSWORD = "123"
 
+
 def service_text_obj(text):
     names.o_service_home_text_obj["text"] = text
     return names.o_service_home_text_obj
@@ -249,40 +249,24 @@
             test.passes("Confirm button is not available")
     test.endSection()
     
-def navigate_to_service_password_screen():
-    """
-        Method to verify Service screen password 
-    """
-    test.startSection("Navigating to Service password and verifying the confirm and back button")
-    hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_STAN.value, sub_mode=HDOpSubModes.STANDBY_START_STATE.value)
-    mouseClick(waitForObjectExists(names.o_settings_text))
-    mouseClick(waitForObjectExists(names.o_service_text))
-    test.compare(waitForObjectExists(names.o_input_password),SERVICE_PASSWORD)
-    mouseClick(waitForObjectExists(names.o_service_confirm_btn)) 
-    mouseClick(waitForObjectExists(names.o_settings_text))
-    mouseClick(waitForObjectExists(names.o_service_text))
-    mouseClick(waitForObjectExists(names.o_service_back_btn))
-    utils.waitForGUI(1)
-    test.endSection()
-    
 def main():
     
     utils.tstStart(__file__)
     startApplication(config.AUT_NAME)
     
-#     navigate_to_service_screen()
-#     navigate_to_set_date_and_time()
-    navigate_to_service_password_screen()
-#     verify_back_btn()
-#     verify_entered_date_and_time(hour="24", min="33", day="1", month="3", year="2022", valid_parameter_passed=config.INVALID)
-#     verify_entered_date_and_time(hour="00", min="60", day="29", month="2", year="2020", valid_parameter_passed=config.INVALID)
-#     verify_entered_date_and_time(hour="13", min="33", day="32", month="2", year="2022", valid_parameter_passed=config.INVALID)
-#     verify_entered_date_and_time(hour="13", min="33", day="4", month="13", year="2022", valid_parameter_passed=config.INVALID)
-#     verify_entered_date_and_time(hour="22", min="33", day="22", month="12", year="2101", valid_parameter_passed=config.INVALID)
-#     verify_entered_date_and_time(hour="22", min="33", day="22", month="11", year="1969", valid_parameter_passed=config.INVALID)
-#     verify_entered_date_and_time(hour="23", min="12", day="7", month="8", year="1977", valid_parameter_passed=config.VALID)
-#     utility.get_current_log_details(message_text=HD_DATE_AND_TIME_MESSAGE)
-#     utility.get_current_log_details(message_text=DG_DATE_AND_TIME_MESSAGE)
+    navigate_to_service_screen()
+    navigate_to_set_date_and_time()
+      
+    verify_back_btn()
+    verify_entered_date_and_time(hour="24", min="33", day="1", month="3", year="2022", valid_parameter_passed=config.INVALID)
+    verify_entered_date_and_time(hour="00", min="60", day="29", month="2", year="2020", valid_parameter_passed=config.INVALID)
+    verify_entered_date_and_time(hour="13", min="33", day="32", month="2", year="2022", valid_parameter_passed=config.INVALID)
+    verify_entered_date_and_time(hour="13", min="33", day="4", month="13", year="2022", valid_parameter_passed=config.INVALID)
+    verify_entered_date_and_time(hour="22", min="33", day="22", month="12", year="2101", valid_parameter_passed=config.INVALID)
+    verify_entered_date_and_time(hour="22", min="33", day="22", month="11", year="1969", valid_parameter_passed=config.INVALID)
+    verify_entered_date_and_time(hour="23", min="12", day="7", month="8", year="1977", valid_parameter_passed=config.VALID)
+    utility.get_current_log_details(message_text=HD_DATE_AND_TIME_MESSAGE)
+    utility.get_current_log_details(message_text=DG_DATE_AND_TIME_MESSAGE)
     utils.tstDone()
     
     
\ No newline at end of file