diff --git a/data/boot_table.json b/data/boot_table.json
index b8af1b3..0c3bdfe 100644
--- a/data/boot_table.json
+++ b/data/boot_table.json
@@ -1,7 +1,4 @@
 {
-    # Power on boot types:
-
-    # Initiate a power on using the REST API interface.
     "REST Power On": {
         "start": {
             "rest": "^1$",
@@ -25,7 +22,6 @@
         "method": "Initiate Host Boot  wait=${0}",
         "lib_file_path": "state_manager.robot"
     },
-    # Initiate a power on using the Redfish API interface.
     "Redfish Power On": {
         "start": {
             "rest": "^1$",
@@ -49,7 +45,6 @@
         "method": "Redfish Power Operation  On",
         "lib_file_path": "bmc_redfish_utils.robot"
     },
-    # Initiate a power on using the IPMI interface.
     "IPMI Power On": {
         "start": {
             "rest": "^1$",
@@ -74,9 +69,6 @@
         "lib_file_path": "ipmi_client.robot"
     },
 
-    # Power off boot types:
-
-    # Initiate a power off using the REST API interface.
     "REST Power Off": {
         "start": {
             "rest": "^1$",
@@ -97,7 +89,6 @@
         "method": "Initiate Host PowerOff  wait=${0}",
         "lib_file_path": "state_manager.robot"
     },
-    # Initiate a power off using the Redfish API interface.
     "Redfish Power Off": {
         "start": {
             "rest": "^1$",
@@ -118,7 +109,6 @@
         "method": "Redfish Power Operation  GracefulShutdown",
         "lib_file_path": "bmc_redfish_utils.robot"
     },
-    # Initiate a hard power off using the REST API interface.
     "REST Hard Power Off": {
         "start": {
             "rest": "^1$",
@@ -139,7 +129,6 @@
         "method": "Hard Power Off  wait=${0}",
         "lib_file_path": "state_manager.robot"
     },
-    # Initiate a hard power off using the Redfish API interface.
     "Redfish Hard Power Off": {
         "start": {
             "rest": "^1$",
@@ -160,7 +149,6 @@
         "method": "Redfish Power Operation  ForceOff",
         "lib_file_path": "bmc_redfish_utils.robot"
     },
-    # Initiate a power off using the IPMI interface.
     "IPMI Power Off": {
         "start": {
             "rest": "^1$",
@@ -181,7 +169,6 @@
         "method": "Run External IPMI Standard Command  power off -N 10 -R 1",
         "lib_file_path": "ipmi_client.robot"
     },
-    # Initiate a power soft using the IPMI interface.
     "IPMI Power Soft": {
         "start": {
             "rest": "^1$",
@@ -202,7 +189,6 @@
         "method": "Run External IPMI Standard Command  power soft -N 10 -R 1",
         "lib_file_path": "ipmi_client.robot"
     },
-    # Run a "shutdown" command on the OS_HOST.
     "Host Power Off": {
         "start": {
             "rest": "^1$",
@@ -230,10 +216,6 @@
         "lib_file_path": "utils.robot"
     },
 
-    # OBMC re-boot boot types:
-
-    # APOR - Auto Power On Restart - Note that this is functionally equivalent
-    # to 'PDU AC Cycle (run)'.
     "APOR": {
         "start": {
             "rest": "^1$",
@@ -260,7 +242,6 @@
         "method": "Set Global Variable  ${PDU_TYPE}  pdu ; Set Global Variable  ${PDU_IP}  ${PDU_HOST} ; PDU Power Cycle",
         "lib_file_path": "pdu/pdu.robot:pdu/synaccess.robot"
     },
-    # Run a "reboot" on the OBMC while host is running.
     "OBMC Reboot (run)": {
         "start": {
             "rest": "^1$",
@@ -286,7 +267,6 @@
         "method_type": "keyword",
         "method": "BMC Execute Command  /sbin/reboot  fork=${1}"
     },
-    # Run a REST "reboot" on the OBMC while host is running.
     "REST OBMC Reboot (run)": {
         "start": {
             "rest": "^1$",
@@ -313,7 +293,6 @@
         "method": "Initiate BMC Reboot  wait=${0}",
         "lib_file_path": "state_manager.robot"
     },
-    # Run a Redfish "reboot" on the OBMC while host is running.
     "Redfish OBMC Reboot (run)": {
         "start": {
             "rest": "^1$",
@@ -340,7 +319,6 @@
         "method": "Redfish BMC Reset Operation",
         "lib_file_path": "bmc_redfish_utils.robot"
     },
-    # Run a "reboot" on the OBMC while host is off.
     "OBMC Reboot (off)": {
         "start": {
             "rest": "^1$",
@@ -357,7 +335,6 @@
         "method_type": "keyword",
         "method": "BMC Execute Command  /sbin/reboot  fork=${1}"
     },
-    # Run a "reboot" on the OBMC while host is off.
     "REST OBMC Reboot (off)": {
         "start": {
             "rest": "^1$",
@@ -375,7 +352,6 @@
         "method": "Initiate BMC Reboot  wait=${0}",
         "lib_file_path": "state_manager.robot"
     },
-    # Run a "reboot" on the OBMC while host is off.
     "Redfish OBMC Reboot (off)": {
         "start": {
             "rest": "^1$",
@@ -393,7 +369,6 @@
         "method": "Redfish BMC Reset Operation",
         "lib_file_path": "bmc_redfish_utils.robot"
     },
-    # Cycle AC via the PDU while host is off.
     "PDU AC Cycle (run)": {
         "start": {
             "rest": "^1$",
@@ -420,7 +395,6 @@
         "method": "Set Global Variable  ${PDU_TYPE}  pdu ; Set Global Variable  ${PDU_IP}  ${PDU_HOST} ; PDU Power Cycle",
         "lib_file_path": "pdu/pdu.robot:pdu/synaccess.robot"
     },
-    # Cycle AC via the PDU while host is off.
     "PDU AC Cycle (off)": {
         "start": {
             "rest": "^1$",
@@ -438,8 +412,6 @@
         "method": "Set Global Variable  ${PDU_TYPE}  pdu ; Set Global Variable  ${PDU_IP}  ${PDU_HOST} ; PDU Power Cycle",
         "lib_file_path": "pdu/pdu.robot:pdu/synaccess.robot"
     },
-    # Initiate an mc reset warm using the IPMI interface while chassis is
-    # powered on.
     "IPMI MC Reset Warm (run)": {
         "start": {
             "rest": "^1$",
@@ -466,8 +438,6 @@
         "method": "Run External IPMI Standard Command  mc reset warm -N 10 -R 1 ; Printn",
         "lib_file_path": "ipmi_client.robot:gen_print.py"
     },
-    # Initiate an mc reset warm using the IPMI interface while chassis is
-    # powered off.
     "IPMI MC Reset Warm (off)": {
         "start": {
             "rest": "^1$",
@@ -485,8 +455,6 @@
         "method": "Run External IPMI Standard Command  mc reset warm -N 10 -R 1 ; Printn",
         "lib_file_path": "ipmi_client.robot:gen_print.py"
     },
-    # Initiate an mc reset cold using the IPMI interface while chassis is
-    # powered on.
     "IPMI MC Reset Cold (run)": {
         "start": {
             "rest": "^1$",
@@ -513,8 +481,6 @@
         "method": "Run External IPMI Standard Command  mc reset cold -N 10 -R 1 ; Printn",
         "lib_file_path": "ipmi_client.robot:gen_print.py"
     },
-    # Initiate an mc reset cold using the IPMI interface while chassis is
-    # powered off.
     "IPMI MC Reset Cold (off)": {
         "start": {
             "rest": "^1$",
@@ -532,8 +498,6 @@
         "method": "Run External IPMI Standard Command  mc reset cold -N 10 -R 1 ; Printn",
         "lib_file_path": "ipmi_client.robot:gen_print.py"
     },
-    # Initiate an mc reset warm using the IPMI standard interface while chassis
-    # is powered on.
     "IPMI Std MC Reset Warm (run)": {
         "start": {
             "rest": "^1$",
@@ -560,8 +524,6 @@
         "method": "Run IPMI Standard Command  mc reset warm -N 10 -R 1 ; Printn",
         "lib_file_path": "ipmi_client.robot:gen_print.py"
     },
-    # Initiate an mc reset warm using the IPMI standard interface while chassis
-    # is powered off.
     "IPMI Std MC Reset Warm (off)": {
         "start": {
             "rest": "^1$",
@@ -579,8 +541,6 @@
         "method": "Run IPMI Standard Command  mc reset warm -N 10 -R 1 ; Printn",
         "lib_file_path": "ipmi_client.robot:gen_print.py"
     },
-    # Initiate an mc reset cold using the IPMI standard interface while chassis
-    # is powered on.
     "IPMI Std MC Reset Cold (run)": {
         "start": {
             "rest": "^1$",
@@ -607,8 +567,6 @@
         "method": "Run IPMI Standard Command  mc reset cold -N 10 -R 1 ; Printn",
         "lib_file_path": "ipmi_client.robot:gen_print.py"
     },
-    # Initiate an mc reset cold using the IPMI standard interface while chassis
-    # is powered off.
     "IPMI Std MC Reset Cold (off)": {
         "start": {
             "rest": "^1$",
@@ -627,9 +585,6 @@
         "lib_file_path": "ipmi_client.robot:gen_print.py"
     },
 
-    # Host OS re-boot boot types:
-
-    # Initiate a power cycle using the IPMI interface (equivalent to off/on).
     "IPMI Power Cycle": {
         "start": {
             "rest": "^1$",
@@ -656,8 +611,6 @@
         "method": "Run External IPMI Standard Command  power cycle -N 10 -R 1",
         "lib_file_path": "ipmi_client.robot"
     },
-    # Initiate a power reset using the IPMI interface (equivalent to off/on).
-    # Functionally equivalent to "IPMI Power Cycle".
     "IPMI Power Reset": {
         "start": {
             "rest": "^1$",
@@ -684,7 +637,6 @@
         "method": "Run External IPMI Standard Command  power reset -N 10 -R 1",
         "lib_file_path": "ipmi_client.robot"
     },
-    # Do an auto reboot by setting auto reboot to "yes" and going to quiesce state.
     "Auto Reboot": {
         "start": {
             "rest": "^1$",
@@ -711,7 +663,6 @@
         "method": "utils.Initiate Auto Reboot  1000",
         "lib_file_path": "utils.robot"
     },
-    # Run a "reboot" command on the OS_HOST.
     "Host Reboot": {
         "start": {
             "rest": "^1$",
@@ -738,7 +689,6 @@
         "method": "utils.Initiate OS Host Reboot",
         "lib_file_path": "utils.robot"
     },
-    # Initiate host reboot using the Redfish API interface (GracefulRestart).
     "RF SYS GracefulRestart": {
         "start": {
             "rest": "^1$",
@@ -765,7 +715,6 @@
         "method": "Redfish Power Operation  GracefulRestart",
         "lib_file_path": "bmc_redfish_utils.robot"
     },
-    # Initiate host reboot using the Redfish API interface (ForceRestart).
     "RF SYS ForceRestart": {
         "start": {
             "rest": "^1$",
@@ -792,7 +741,6 @@
         "method": "Redfish Power Operation  ForceRestart",
         "lib_file_path": "bmc_redfish_utils.robot"
     },
-    # OPAL Terminate Immediate.
     "OPAL TI": {
         "start": {
             "rest": "^1$",
diff --git a/data/boot_table_redfish.json b/data/boot_table_redfish.json
index 485ff19..a13d5f9 100644
--- a/data/boot_table_redfish.json
+++ b/data/boot_table_redfish.json
@@ -1,7 +1,4 @@
 {
-    # Power on boot types:
-
-    # Initiate a power on using the Redfish API interface.
     "Redfish Power On": {
         "start": {
             "redfish": "^1$",
@@ -23,7 +20,6 @@
         "method": "Redfish Power Operation  On",
         "lib_file_path": "bmc_redfish_utils.robot"
     },
-    # Initiate a power on using the IPMI interface.
     "IPMI Power On": {
         "start": {
             "redfish": "^1$",
@@ -46,9 +42,6 @@
         "lib_file_path": "ipmi_client.robot"
     },
 
-    # Power off boot types:
-
-    # Initiate a power off using the Redfish API interface.
     "Redfish Power Off": {
         "start": {
             "redfish": "^1$",
@@ -68,7 +61,6 @@
         "method": "Redfish Power Operation  GracefulShutdown",
         "lib_file_path": "bmc_redfish_utils.robot"
     },
-    # Initiate a hard power off using the Redfish API interface.
     "Redfish Hard Power Off": {
         "start": {
             "redfish": "^1$",
@@ -88,7 +80,6 @@
         "method": "Redfish Power Operation  ForceOff",
         "lib_file_path": "bmc_redfish_utils.robot"
     },
-    # Initiate a power off using the IPMI interface.
     "IPMI Power Off": {
         "start": {
             "redfish": "^1$",
@@ -108,7 +99,6 @@
         "method": "Run External IPMI Standard Command  power off -N 10 -R 1",
         "lib_file_path": "ipmi_client.robot"
     },
-    # Initiate a power soft using the IPMI interface.
     "IPMI Power Soft": {
         "start": {
             "redfish": "^1$",
@@ -128,7 +118,6 @@
         "method": "Run External IPMI Standard Command  power soft -N 10 -R 1",
         "lib_file_path": "ipmi_client.robot"
     },
-    # Run a "shutdown" command on the OS_HOST.
     "Host Power Off": {
         "start": {
             "redfish": "^1$",
@@ -154,10 +143,6 @@
         "lib_file_path": "utils.robot"
     },
 
-    # OBMC re-boot boot types:
-
-    # APOR - Auto Power On Restart - Note that this is functionally equivalent
-    # to 'PDU AC Cycle (run)'.
     "APOR": {
         "start": {
             "redfish": "^1$",
@@ -182,7 +167,6 @@
         "method": "Set Global Variable  ${PDU_TYPE}  pdu ; Set Global Variable  ${PDU_IP}  ${PDU_HOST} ; PDU Power Cycle",
         "lib_file_path": "pdu/pdu.robot:pdu/synaccess.robot"
     },
-    # Run a "reboot" on the OBMC while host is running.
     "OBMC Reboot (run)": {
         "start": {
             "redfish": "^1$",
@@ -206,7 +190,6 @@
         "method_type": "keyword",
         "method": "BMC Execute Command  /sbin/reboot  fork=${1}"
     },
-    # Run a Redfish "reboot" on the OBMC while host is running.
     "Redfish OBMC Reboot (run)": {
         "start": {
             "redfish": "^1$",
@@ -231,7 +214,6 @@
         "method": "Redfish BMC Reset Operation",
         "lib_file_path": "bmc_redfish_utils.robot"
     },
-    # Run a "reboot" on the OBMC while host is off.
     "OBMC Reboot (off)": {
         "start": {
             "redfish": "^1$",
@@ -247,7 +229,6 @@
         "method_type": "keyword",
         "method": "BMC Execute Command  /sbin/reboot  fork=${1}"
     },
-    # Run a "reboot" on the OBMC while host is off.
     "Redfish OBMC Reboot (off)": {
         "start": {
             "redfish": "^1$",
@@ -264,7 +245,6 @@
         "method": "Redfish BMC Reset Operation",
         "lib_file_path": "bmc_redfish_utils.robot"
     },
-    # Cycle AC via the PDU while host is off.
     "PDU AC Cycle (run)": {
         "start": {
             "redfish": "^1$",
@@ -289,7 +269,6 @@
         "method": "Set Global Variable  ${PDU_TYPE}  pdu ; Set Global Variable  ${PDU_IP}  ${PDU_HOST} ; PDU Power Cycle",
         "lib_file_path": "pdu/pdu.robot:pdu/synaccess.robot"
     },
-    # Cycle AC via the PDU while host is off.
     "PDU AC Cycle (off)": {
         "start": {
             "redfish": "^1$",
@@ -306,8 +285,6 @@
         "method": "Set Global Variable  ${PDU_TYPE}  pdu ; Set Global Variable  ${PDU_IP}  ${PDU_HOST} ; PDU Power Cycle",
         "lib_file_path": "pdu/pdu.robot:pdu/synaccess.robot"
     },
-    # Initiate an mc reset warm using the IPMI interface while chassis is
-    # powered on.
     "IPMI MC Reset Warm (run)": {
         "start": {
             "redfish": "^1$",
@@ -332,8 +309,6 @@
         "method": "Run External IPMI Standard Command  mc reset warm -N 10 -R 1 ; Printn",
         "lib_file_path": "ipmi_client.robot:gen_print.py"
     },
-    # Initiate an mc reset warm using the IPMI interface while chassis is
-    # powered off.
     "IPMI MC Reset Warm (off)": {
         "start": {
             "redfish": "^1$",
@@ -350,8 +325,6 @@
         "method": "Run External IPMI Standard Command  mc reset warm -N 10 -R 1 ; Printn",
         "lib_file_path": "ipmi_client.robot:gen_print.py"
     },
-    # Initiate an mc reset cold using the IPMI interface while chassis is
-    # powered on.
     "IPMI MC Reset Cold (run)": {
         "start": {
             "redfish": "^1$",
@@ -376,8 +349,6 @@
         "method": "Run External IPMI Standard Command  mc reset cold -N 10 -R 1 ; Printn",
         "lib_file_path": "ipmi_client.robot:gen_print.py"
     },
-    # Initiate an mc reset cold using the IPMI interface while chassis is
-    # powered off.
     "IPMI MC Reset Cold (off)": {
         "start": {
             "redfish": "^1$",
@@ -394,8 +365,6 @@
         "method": "Run External IPMI Standard Command  mc reset cold -N 10 -R 1 ; Printn",
         "lib_file_path": "ipmi_client.robot:gen_print.py"
     },
-    # Initiate an mc reset warm using the IPMI standard interface while chassis
-    # is powered on.
     "IPMI Std MC Reset Warm (run)": {
         "start": {
             "redfish": "^1$",
@@ -420,8 +389,6 @@
         "method": "Run IPMI Standard Command  mc reset warm -N 10 -R 1 ; Printn",
         "lib_file_path": "ipmi_client.robot:gen_print.py"
     },
-    # Initiate an mc reset warm using the IPMI standard interface while chassis
-    # is powered off.
     "IPMI Std MC Reset Warm (off)": {
         "start": {
             "redfish": "^1$",
@@ -438,8 +405,6 @@
         "method": "Run IPMI Standard Command  mc reset warm -N 10 -R 1 ; Printn",
         "lib_file_path": "ipmi_client.robot:gen_print.py"
     },
-    # Initiate an mc reset cold using the IPMI standard interface while chassis
-    # is powered on.
     "IPMI Std MC Reset Cold (run)": {
         "start": {
             "redfish": "^1$",
@@ -464,8 +429,6 @@
         "method": "Run IPMI Standard Command  mc reset cold -N 10 -R 1 ; Printn",
         "lib_file_path": "ipmi_client.robot:gen_print.py"
     },
-    # Initiate an mc reset cold using the IPMI standard interface while chassis
-    # is powered off.
     "IPMI Std MC Reset Cold (off)": {
         "start": {
             "redfish": "^1$",
@@ -482,10 +445,6 @@
         "method": "Run IPMI Standard Command  mc reset cold -N 10 -R 1 ; Printn",
         "lib_file_path": "ipmi_client.robot:gen_print.py"
     },
-
-    # Host OS re-boot boot types:
-
-    # Initiate a power cycle using the IPMI interface (equivalent to off/on).
     "IPMI Power Cycle": {
         "start": {
             "redfish": "^1$",
@@ -510,8 +469,6 @@
         "method": "Run External IPMI Standard Command  power cycle -N 10 -R 1",
         "lib_file_path": "ipmi_client.robot"
     },
-    # Initiate a power reset using the IPMI interface (equivalent to off/on).
-    # Functionally equivalent to "IPMI Power Cycle".
     "IPMI Power Reset": {
         "start": {
             "redfish": "^1$",
@@ -536,9 +493,6 @@
         "method": "Run External IPMI Standard Command  power reset -N 10 -R 1",
         "lib_file_path": "ipmi_client.robot"
     },
-    # Do an auto reboot by setting auto reboot to "yes" and going to quiesce state.
-    # Start of host state as off and "Redfish Initiate Auto Reboot" invoke poweron
-    # sleep 30 and then inject the auto reboot sequence.
     "Auto Reboot": {
         "start": {
             "redfish": "^1$",
@@ -563,7 +517,6 @@
         "method": "utils.Redfish Initiate Auto Reboot  1000",
         "lib_file_path": "utils.robot"
     },
-    # Run a "reboot" command on the OS_HOST.
     "Host Reboot": {
         "start": {
             "redfish": "^1$",
@@ -588,7 +541,6 @@
         "method": "utils.Initiate OS Host Reboot",
         "lib_file_path": "utils.robot"
     },
-    # Initiate host reboot using the Redfish API interface (GracefulRestart).
     "RF SYS GracefulRestart": {
         "start": {
             "redfish": "^1$",
@@ -613,7 +565,6 @@
         "method": "Redfish Power Operation  GracefulRestart",
         "lib_file_path": "bmc_redfish_utils.robot"
     },
-    # Initiate host reboot using the Redfish API interface (ForceRestart).
     "RF SYS ForceRestart": {
         "start": {
             "redfish": "^1$",
@@ -638,7 +589,6 @@
         "method": "Redfish Power Operation  ForceRestart",
         "lib_file_path": "bmc_redfish_utils.robot"
     },
-    # OPAL Terminate Immediate.
     "OPAL TI": {
         "start": {
             "redfish": "^1$",
diff --git a/data/boot_table_x86.json b/data/boot_table_x86.json
index 48e28b5..ed40ea6 100644
--- a/data/boot_table_x86.json
+++ b/data/boot_table_x86.json
@@ -1,7 +1,4 @@
 {
-    # Power on boot types:
-
-    # Initiate a power on using the Redfish API interface.
     "Redfish Power On": {
         "start": {
             "redfish": "^1$",
@@ -21,7 +18,6 @@
         "method": "Redfish Power Operation  On",
         "lib_file_path": "bmc_redfish_utils.robot"
     },
-    # Initiate a power on using the IPMI interface.
     "IPMI Power On": {
         "start": {
             "redfish": "^1$",
@@ -42,9 +38,6 @@
         "lib_file_path": "ipmi_client.robot"
     },
 
-    # Power off boot types:
-
-    # Initiate a power off using the Redfish API interface.
     "Redfish Power Off": {
         "start": {
             "redfish": "^1$",
@@ -63,7 +56,6 @@
         "method": "Redfish Power Operation  GracefulShutdown",
         "lib_file_path": "bmc_redfish_utils.robot"
     },
-    # Initiate a hard power off using the Redfish API interface.
     "Redfish Hard Power Off": {
         "start": {
             "redfish": "^1$",
@@ -82,7 +74,6 @@
         "method": "Redfish Power Operation  ForceOff",
         "lib_file_path": "bmc_redfish_utils.robot"
     },
-    # Initiate a power off using the IPMI interface.
     "IPMI Power Off": {
         "start": {
             "redfish": "^1$",
@@ -101,7 +92,6 @@
         "method": "Run External IPMI Standard Command  power off -N 10 -R 1",
         "lib_file_path": "ipmi_client.robot"
     },
-    # Initiate a power soft using the IPMI interface.
     "IPMI Power Soft": {
         "start": {
             "redfish": "^1$",
@@ -120,7 +110,6 @@
         "method": "Run External IPMI Standard Command  power soft -N 10 -R 1",
         "lib_file_path": "ipmi_client.robot"
     },
-    # Run a "shutdown" command on the OS_HOST.
     "Host Power Off": {
         "start": {
             "redfish": "^1$",
@@ -144,10 +133,6 @@
         "lib_file_path": "utils.robot"
     },
 
-    # OBMC re-boot boot types:
-
-    # APOR - Auto Power On Restart - Note that this is functionally equivalent
-    # to 'PDU AC Cycle (run)'.
     "APOR": {
         "start": {
             "redfish": "^1$",
@@ -170,7 +155,6 @@
         "method": "Set Global Variable  ${PDU_TYPE}  pdu ; Set Global Variable  ${PDU_IP}  ${PDU_HOST} ; PDU Power Cycle",
         "lib_file_path": "pdu/pdu.robot:pdu/synaccess.robot"
     },
-    # Run a "reboot" on the OBMC while host is running.
     "OBMC Reboot (run)": {
         "start": {
             "redfish": "^1$",
@@ -192,7 +176,6 @@
         "method_type": "keyword",
         "method": "BMC Execute Command  /sbin/reboot  fork=${1}"
     },
-    # Run a Redfish "reboot" on the OBMC while host is running.
     "Redfish OBMC Reboot (run)": {
         "start": {
             "redfish": "^1$",
@@ -215,7 +198,6 @@
         "method": "Redfish BMC Reset Operation",
         "lib_file_path": "bmc_redfish_utils.robot"
     },
-    # Run a "reboot" on the OBMC while host is off.
     "OBMC Reboot (off)": {
         "start": {
             "redfish": "^1$",
@@ -230,7 +212,6 @@
         "method_type": "keyword",
         "method": "BMC Execute Command  /sbin/reboot  fork=${1}"
     },
-    # Run a "reboot" on the OBMC while host is off.
     "Redfish OBMC Reboot (off)": {
         "start": {
             "redfish": "^1$",
@@ -246,7 +227,6 @@
         "method": "Redfish BMC Reset Operation",
         "lib_file_path": "bmc_redfish_utils.robot"
     },
-    # Cycle AC via the PDU while host is off.
     "PDU AC Cycle (run)": {
         "start": {
             "redfish": "^1$",
@@ -269,7 +249,6 @@
         "method": "Set Global Variable  ${PDU_TYPE}  pdu ; Set Global Variable  ${PDU_IP}  ${PDU_HOST} ; PDU Power Cycle",
         "lib_file_path": "pdu/pdu.robot:pdu/synaccess.robot"
     },
-    # Cycle AC via the PDU while host is off.
     "PDU AC Cycle (off)": {
         "start": {
             "redfish": "^1$",
@@ -285,8 +264,6 @@
         "method": "Set Global Variable  ${PDU_TYPE}  pdu ; Set Global Variable  ${PDU_IP}  ${PDU_HOST} ; PDU Power Cycle",
         "lib_file_path": "pdu/pdu.robot:pdu/synaccess.robot"
     },
-    # Initiate an mc reset warm using the IPMI interface while chassis is
-    # powered on.
     "IPMI MC Reset Warm (run)": {
         "start": {
             "redfish": "^1$",
@@ -309,8 +286,6 @@
         "method": "Run External IPMI Standard Command  mc reset warm -N 10 -R 1 ; Printn",
         "lib_file_path": "ipmi_client.robot:gen_print.py"
     },
-    # Initiate an mc reset warm using the IPMI interface while chassis is
-    # powered off.
     "IPMI MC Reset Warm (off)": {
         "start": {
             "redfish": "^1$",
@@ -326,8 +301,6 @@
         "method": "Run External IPMI Standard Command  mc reset warm -N 10 -R 1 ; Printn",
         "lib_file_path": "ipmi_client.robot:gen_print.py"
     },
-    # Initiate an mc reset cold using the IPMI interface while chassis is
-    # powered on.
     "IPMI MC Reset Cold (run)": {
         "start": {
             "redfish": "^1$",
@@ -350,8 +323,6 @@
         "method": "Run External IPMI Standard Command  mc reset cold -N 10 -R 1 ; Printn",
         "lib_file_path": "ipmi_client.robot:gen_print.py"
     },
-    # Initiate an mc reset cold using the IPMI interface while chassis is
-    # powered off.
     "IPMI MC Reset Cold (off)": {
         "start": {
             "redfish": "^1$",
@@ -367,8 +338,6 @@
         "method": "Run External IPMI Standard Command  mc reset cold -N 10 -R 1 ; Printn",
         "lib_file_path": "ipmi_client.robot:gen_print.py"
     },
-    # Initiate an mc reset warm using the IPMI standard interface while chassis
-    # is powered on.
     "IPMI Std MC Reset Warm (run)": {
         "start": {
             "redfish": "^1$",
@@ -391,8 +360,6 @@
         "method": "Run IPMI Standard Command  mc reset warm -N 10 -R 1 ; Printn",
         "lib_file_path": "ipmi_client.robot:gen_print.py"
     },
-    # Initiate an mc reset warm using the IPMI standard interface while chassis
-    # is powered off.
     "IPMI Std MC Reset Warm (off)": {
         "start": {
             "redfish": "^1$",
@@ -408,8 +375,6 @@
         "method": "Run IPMI Standard Command  mc reset warm -N 10 -R 1 ; Printn",
         "lib_file_path": "ipmi_client.robot:gen_print.py"
     },
-    # Initiate an mc reset cold using the IPMI standard interface while chassis
-    # is powered on.
     "IPMI Std MC Reset Cold (run)": {
         "start": {
             "redfish": "^1$",
@@ -432,8 +397,6 @@
         "method": "Run IPMI Standard Command  mc reset cold -N 10 -R 1 ; Printn",
         "lib_file_path": "ipmi_client.robot:gen_print.py"
     },
-    # Initiate an mc reset cold using the IPMI standard interface while chassis
-    # is powered off.
     "IPMI Std MC Reset Cold (off)": {
         "start": {
             "redfish": "^1$",
@@ -449,10 +412,6 @@
         "method": "Run IPMI Standard Command  mc reset cold -N 10 -R 1 ; Printn",
         "lib_file_path": "ipmi_client.robot:gen_print.py"
     },
-
-    # Host OS re-boot boot types:
-
-    # Initiate a power cycle using the IPMI interface (equivalent to off/on).
     "IPMI Power Cycle": {
         "start": {
             "redfish": "^1$",
@@ -475,8 +434,6 @@
         "method": "Run External IPMI Standard Command  power cycle -N 10 -R 1",
         "lib_file_path": "ipmi_client.robot"
     },
-    # Initiate a power reset using the IPMI interface (equivalent to off/on).
-    # Functionally equivalent to "IPMI Power Cycle".
     "IPMI Power Reset": {
         "start": {
             "redfish": "^1$",
@@ -499,7 +456,6 @@
         "method": "Run External IPMI Standard Command  power reset -N 10 -R 1",
         "lib_file_path": "ipmi_client.robot"
     },
-    # Do an auto reboot by setting auto reboot to "yes" and going to quiesce state.
     "Auto Reboot": {
         "start": {
             "redfish": "^1$",
@@ -522,7 +478,6 @@
         "method": "utils.Initiate Auto Reboot  1000",
         "lib_file_path": "utils.robot"
     },
-    # Run a "reboot" command on the OS_HOST.
     "Host Reboot": {
         "start": {
             "redfish": "^1$",
@@ -545,7 +500,6 @@
         "method": "utils.Initiate OS Host Reboot",
         "lib_file_path": "utils.robot"
     },
-    # Initiate host reboot using the Redfish API interface (GracefulRestart).
     "RF SYS GracefulRestart": {
         "start": {
             "redfish": "^1$",
@@ -568,7 +522,6 @@
         "method": "Redfish Power Operation  GracefulRestart",
         "lib_file_path": "bmc_redfish_utils.robot"
     },
-    # Initiate host reboot using the Redfish API interface (ForceRestart).
     "RF SYS ForceRestart": {
         "start": {
             "redfish": "^1$",
@@ -591,7 +544,6 @@
         "method": "Redfish Power Operation  ForceRestart",
         "lib_file_path": "bmc_redfish_utils.robot"
     },
-    # OPAL Terminate Immediate.
     "OPAL TI": {
         "start": {
             "redfish": "^1$",
diff --git a/test_lists/QEMU_CI b/test_lists/QEMU_CI
index 0ae91ed..91f5904 100644
--- a/test_lists/QEMU_CI
+++ b/test_lists/QEMU_CI
@@ -9,7 +9,6 @@
 -i Redfish_Login_Using_Invalid_Token
 -i Delete_Redfish_Session_Using_Valid_Login
 -i Redfish_Login_With_Invalid_Credentials
--i Redfish_Login_Using_Unsecured_HTTP
 -i Verify_Update_Service_Enabled
 -i Verify_Redfish_Software_Inventory_Collection
 -i Redfish_Software_Inventory_Status_Check