diff --git a/redfish/extended/redfish_bmc_code_update.robot b/redfish/extended/redfish_bmc_code_update.robot
index 75fdaf5..143d827 100644
--- a/redfish/extended/redfish_bmc_code_update.robot
+++ b/redfish/extended/redfish_bmc_code_update.robot
@@ -61,30 +61,11 @@
     ${nonfunctional_sw_inv}=  Get Non Functional Firmware  ${sw_inv}  False
 
     # Redfish active software image API.
-    Run Keyword If  not ${FORCE_UPDATE}
-    ...  Run Keyword If  ${num_records} > 0
-    ...    Run Keyword If  '${nonfunctional_sw_inv['version']}' == '${image_version}'
-    ...      Run Keywords  Switch Backup Firmware Image To Functional  AND
-    ...      Wait For Reboot  start_boot_seconds=${state['epoch_seconds']}  AND
-    ...      Redfish Verify BMC Version  ${IMAGE_FILE_PATH}  AND
-    ...      Pass Execution  The firmware ${image_version} is backup image.
+    Run Keyword If  ${num_records} > 0
+    ...  Run Keyword If  '${nonfunctional_sw_inv['version']}' == '${image_version}'
+    ...  Set Backup Firmware To Functional  ${image_version}  ${state}
 
-    # Firmware inventory record of the given image version.
-    ${image_info}=  Get Software Inventory State By Version  ${image_version}
-
-    ${image_info_len}=  Get Length  ${image_info}
-
-    # REST delete the image to fresh code update for a given same image object
-    # which is already ACTIVE but on the alternate side. Irrespective of when
-    # REST is disabled in near future or the below operation fails, is purely
-    # done to give a chance.
-
-    Run Keyword If  '${image_info_len}' != 0
-    ...  Run Keywords  Print Timen
-    ...  The ${image_version} version is installed but not functional, delete and continue update.
-    ...    AND
-    ...  Run Keyword And Ignore Error
-    ...    Delete Software Object  /xyz/openbmc_project/software/${image_info['image_id']}
+    Print Timen  Performing firmware update ${image_version}.
 
     Redfish Update Firmware
 
@@ -213,6 +194,21 @@
     Redfish OBMC Reboot (off)
 
 
+Set Backup Firmware To Functional
+    [Documentation]  Set the backup firmware to functional.
+    [Arguments]  ${image_version}  ${state}
+
+    # Description of argument(s):
+    # image_version     Version of image.
+    # state             Pre reboot state.
+
+    Print Timen  Switch to back up and rebooting.
+    Switch Backup Firmware Image To Functional
+    Wait For Reboot  start_boot_seconds=${state['epoch_seconds']}
+    Redfish Verify BMC Version  ${IMAGE_FILE_PATH}
+    Pass Execution  The backup firmware image ${image_version} is now functional.
+
+
 Redfish Update Firmware
     [Documentation]  Update the BMC firmware via redfish interface.