diff --git a/gui/lib/resource.robot b/gui/lib/resource.robot
index 038d135..115cf8c 100644
--- a/gui/lib/resource.robot
+++ b/gui/lib/resource.robot
@@ -49,7 +49,6 @@
     ...  ELSE IF  '${op_system}' == 'Darwin'
             # Mac OS is currently having some issues with firefox, so using
             # chrome.
-            # TODO: Need to add support for other browsers. Issue #1280.
     ...     Launch Header Browser  chrome
     ...  ELSE
             # Linux OS.
diff --git a/lib/bmc_network_utils.robot b/lib/bmc_network_utils.robot
index 26100e9..68cf19b 100644
--- a/lib/bmc_network_utils.robot
+++ b/lib/bmc_network_utils.robot
@@ -86,7 +86,6 @@
 Get BMC Route Info
     [Documentation]  Get system route info.
 
-
     # Sample output of "ip route":
     # default via xx.xx.xx.x dev eth0
     # xx.xx.xx.0/23 dev eth0  src xx.xx.xx.xx
@@ -97,11 +96,9 @@
 
     RETURN  ${cmd_output}
 
-# TODO: openbmc/openbmc-test-automation#1331
 Get BMC MAC Address
     [Documentation]  Get system MAC address.
 
-
     # Sample output of "ip addr | grep ether":
     # link/ether xx.xx.xx.xx.xx.xx brd ff:ff:ff:ff:ff:ff
 
diff --git a/lib/state_manager.robot b/lib/state_manager.robot
index 2dcf39a..bd6cbe2 100755
--- a/lib/state_manager.robot
+++ b/lib/state_manager.robot
@@ -55,7 +55,6 @@
 Wait For PowerOff
     [Documentation]  Wait for power off state.
 
-    # TODO: Reference to open-power/skiboot#81.
     # Revert to 3 minutes once fixed.
     Wait Until Keyword Succeeds  6 min  10 sec  Is Host Off
 
@@ -142,13 +141,11 @@
 
 Is Host Off
     [Documentation]  Check if host state is "Off".
+
     # Chassis state should be "Off" before we check the host state.
     Is Chassis Off
     ${host_state}=  Get Host State
     Should Be Equal  Off  ${host_state}
-    # Check to verify that the host shutdown completely.
-    # TODO openbmc/openbmc#2049 - boot sensor not cleared on power off
-    #Is OS Off
 
 
 Is Host Rebooted
diff --git a/redfish/systems/eventlog/test_esel.robot b/redfish/systems/eventlog/test_esel.robot
index 5185d24..56c51a2 100644
--- a/redfish/systems/eventlog/test_esel.robot
+++ b/redfish/systems/eventlog/test_esel.robot
@@ -46,7 +46,6 @@
     Verify eSEL Entries
 
 
-# TODO: openbmc/openbmc-test-automation#1789
 Verify eSEL Description And EntryID Using REST
     [Documentation]  Create eSEL log and verify "Description" and "EntryID"
     ...  are not empty via REST.
@@ -95,7 +94,6 @@
     ...  msg=Expecting 2 eSELs but found ${entries}.
 
 
-# TODO: openbmc/openbmc-test-automation#1789
 Check eSEL AdditionalData
     [Documentation]  Generate eSEL log and verify AdditionalData is
     ...              not empty.