diff --git a/data/variables.py b/data/variables.py
index 7727029..30418eb 100755
--- a/data/variables.py
+++ b/data/variables.py
@@ -11,8 +11,7 @@
 
 # REST URI base endpoint paths.
 CONTROL_URI = OPENBMC_BASE_URI + 'control/'
-# old vs new code dependencies in many places.
-# TODO: remove when ready.
+# Continue to keep to support legacy code.
 SETTINGS_URI = '/org/openbmc/settings/'
 WATCHDOG_URI = OPENBMC_BASE_URI + 'watchdog/'
 TIME_MANAGER_URI = OPENBMC_BASE_URI + 'time/'
diff --git a/extended/code_update/bmc_code_update.robot b/extended/code_update/bmc_code_update.robot
index d68eaa8..7a92e00 100644
--- a/extended/code_update/bmc_code_update.robot
+++ b/extended/code_update/bmc_code_update.robot
@@ -79,7 +79,6 @@
     ${functional_version}=  Set Variable  ${bmc_release_info['version_id']}
     Rprint Vars  image_version  functional_version
 
-    # TODO: openbmc/phosphor-bmc-code-mgmt/issues/4
     # Check if the existing firmware is functional.
     Pass Execution If  '${functional_version}' == '${image_version}'
     ...  The existing ${image_version} firmware is already functional.
diff --git a/extended/code_update/code_update_utils.robot b/extended/code_update/code_update_utils.robot
index c8d3d69..6946d90 100755
--- a/extended/code_update/code_update_utils.robot
+++ b/extended/code_update/code_update_utils.robot
@@ -93,7 +93,6 @@
 
     ${targ_file_path}=  Set Variable  /tmp/flashimg
 
-    # TODO: Need to remove this when new code update in place.
     # Example output:
     # root@witherspoon:~# ls -lh /tmp/flashimg
     # -rwxr-xr-x    1 root     root       32.0M Jun 29 01:12 /tmp/flashimg
diff --git a/extended/standby_bmc.robot b/extended/standby_bmc.robot
index b64c7cd..34162c9 100644
--- a/extended/standby_bmc.robot
+++ b/extended/standby_bmc.robot
@@ -70,18 +70,6 @@
     Run Keyword And Ignore Error  Set BMC Power Policy  ${ALWAYS_POWER_OFF}
     Run Keyword And Ignore Error  Redfish Set Power Restore Policy  AlwaysOff
 
-    # TODO: Enable MAC AES check latter.
-    # Reference : openbmc/openbmc-test-automation#998
-    #Run Keyword If  '${MAC_ADDRESS}' != '${EMPTY}'
-    #...  Check And Reset MAC
-
-    # TODO: Add new UBI File system cleanup.
-    # Reference : openbmc/openbmc-test-automation#998
-    #${rc}=  Execute Command  find ${CLEANUP_DIR_PATH}
-    #...  return_stdout=False  return_rc=True
-    #Run Keyword If  '${CLEANUP_DIR_PATH}' != '${EMPTY}' and ${rc} == 0
-    #...  Cleanup Dir
-
     Run Keyword And Ignore Error  Delete All Error Logs
     Run Keyword And Ignore Error  Redfish Purge Event Log
     Run Keyword And Ignore Error  Delete All Dumps
diff --git a/lib/code_update_utils.py b/lib/code_update_utils.py
index 6fceeb9..8490df0 100644
--- a/lib/code_update_utils.py
+++ b/lib/code_update_utils.py
@@ -99,7 +99,6 @@
     num_read_errors = 0
     read_fail_threshold = 1
     while (retry < 60):
-        # TODO: Use retry option in run_key when available.
         status, software_state = keyword.run_key("Read Properties  "
                                                  + var.SOFTWARE_VERSION_URI
                                                  + str(version_id),
diff --git a/lib/code_update_utils.robot b/lib/code_update_utils.robot
index ca71456..02c5cdd 100644
--- a/lib/code_update_utils.robot
+++ b/lib/code_update_utils.robot
@@ -118,7 +118,6 @@
     ${args}=  Create Dictionary  data=${data}
     Write Attribute  ${host_object}  ${sw_attribute}  data=${args}
     # Sync time for software updater manager to update.
-    # TODO: openbmc/openbmc#2857
     Sleep  10s
 
 
diff --git a/lib/rest_client.robot b/lib/rest_client.robot
index f488d49..0fd656b 100644
--- a/lib/rest_client.robot
+++ b/lib/rest_client.robot
@@ -145,7 +145,6 @@
 
     Return From Keyword If  ${bmcweb_status} == ${True}
 
-    # TODO : Task to revert this changes openbmc/openbmc-test-automation#532
     # This will retry at 20 second interval.
     Wait Until Keyword Succeeds  40 sec  20 sec
     ...  Post Login Request  ${timeout}  ${quiet}