diff --git a/extended/standby_bmc.robot b/extended/standby_bmc.robot
index 6434613..0884251 100644
--- a/extended/standby_bmc.robot
+++ b/extended/standby_bmc.robot
@@ -55,12 +55,17 @@
 
     Run Keyword And Ignore Error  Set BMC Power Policy  ${RESTORE_LAST_STATE}
 
-    Run Keyword If  '${MAC_ADDRESS}' != '${EMPTY}'
-    ...  Check And Reset MAC
-    ${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
+    # 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
 
     Delete Error Logs
     Delete All Dumps