diff --git a/extended/standby_bmc.robot b/extended/standby_bmc.robot
index 0884251..34163c7 100644
--- a/extended/standby_bmc.robot
+++ b/extended/standby_bmc.robot
@@ -72,17 +72,6 @@
 
 *** Keywords ***
 
-Reboot and Wait for BMC Online
-    [Documentation]    Reboot BMC and wait for it to come online
-    ...                and boot to standby
-
-    Trigger Warm Reset via Reboot
-    Wait Until Keyword Succeeds
-    ...    5 min   10 sec    BMC Online Test
-
-    Wait For BMC Standby
-
-
 BMC Online Test
     [Documentation]   BMC ping, SSH, REST connection Test
 
@@ -92,22 +81,6 @@
     ...   Fail  msg=System not in ideal state to continue [ERROR]
 
 
-Wait For BMC Standby
-    [Documentation]   Wait Until BMC standby post BMC reboot
-
-    @{states}=   Create List   BMC_READY   HOST_POWERED_OFF
-    Wait Until Keyword Succeeds
-    ...    10 min   10 sec   Verify BMC State   ${states}
-
-
-Get BMC State and Expect Standby
-    [Documentation]   Get BMC state and should be at standby
-
-    @{states}=     Create List   BMC_READY   HOST_POWERED_OFF
-    ${bmc_state}=  Get BMC State Deprecated
-    Should Contain  ${states}   ${bmc_state}
-
-
 Update Policy Setting
     [Documentation]   Update the given restore policy
     [Arguments]   ${policy}
diff --git a/lib/state_manager.robot b/lib/state_manager.robot
index 8d0fa11..e54cbb3 100755
--- a/lib/state_manager.robot
+++ b/lib/state_manager.robot
@@ -304,12 +304,6 @@
 
 Wait For BMC Ready
     [Documentation]  Check BMC state and wait for BMC Ready.
-    @{states}=  Create List  BMC_READY  HOST_POWERED_OFF
-    Run Keyword If  '${OBMC_STATES_VERSION}' == '${0}'
-    ...  Wait Until Keyword Succeeds  10 min  10 sec
-    ...  Verify BMC State  ${states}
-    ...  ELSE
-    ...  Wait Until Keyword Succeeds  10 min  10 sec
-    ...  Is BMC Ready
+    Wait Until Keyword Succeeds  10 min  10 sec  Is BMC Ready
 
 
diff --git a/lib/utils.robot b/lib/utils.robot
index 0fbc6e5..7b4e36d 100755
--- a/lib/utils.robot
+++ b/lib/utils.robot
@@ -340,17 +340,6 @@
 
     rqprint_timen  The operating system is now communicating.
 
-Get BMC State Deprecated
-    [Documentation]  Returns the state of the BMC as a string. (i.e: BMC_READY)
-    [Arguments]  ${quiet}=${QUIET}
-
-    @{arglist}=  Create List
-    ${args}=  Create Dictionary  data=@{arglist}
-    ${resp}=  Call Method  ${OPENBMC_BASE_URI}managers/System/  getSystemState
-    ...        data=${args}  quiet=${quiet}
-    Should be equal as strings  ${resp.status_code}  ${HTTP_OK}
-    ${content}=  to json  ${resp.content}
-    [Return]  ${content["data"]}
 
 Get Power State
     [Documentation]  Returns the power state as an integer. Either 0 or 1.
@@ -408,10 +397,6 @@
     ${status}=    Get Flash BIOS Status
     should be equal as strings     ${status}     Flash Done
 
-Is System State Host Booted
-    [Documentation]  Checks whether system state is HOST_BOOTED.
-    ${state}=    Get BMC State Deprecated
-    should be equal as strings     ${state}     HOST_BOOTED
 
 Is OS Starting
     [Documentation]  Check if boot progress is OS starting.
@@ -633,14 +618,6 @@
     [Return]   ${cur_time}
 
 
-Verify BMC State
-    [Documentation]   Get the BMC state and verify if the current
-    ...               BMC state is as expected.
-    [Arguments]       ${expected}
-
-    ${current}=  Get BMC State Deprecated
-    Should Contain  ${expected}   ${current}
-
 Start Journal Log
     [Documentation]   Start capturing journal log to a file in /tmp using
     ...               journalctl command. By default journal log is collected