diff --git a/lib/firmware_utils.py b/lib/firmware_utils.py
index 4e0dbb5..99ad7c6 100755
--- a/lib/firmware_utils.py
+++ b/lib/firmware_utils.py
@@ -20,7 +20,7 @@
     Example result:
 
     sda_info:
-      [model_number]:                        MTFDDAK1T9TCB 00LY461 00LY570IBM
+      [model_number]:                        MTFDDAK1T9TCB 00LY461 00LY570XXX
       [serial_number]:                       179C413F
       [firmware_revision]:                   MJ06
       [transport]:                           Serial, ATA8-AST, SATA 1.0a, SATA II Extensions, SATA Rev 2.5,
diff --git a/lib/openbmc_ffdc_list.py b/lib/openbmc_ffdc_list.py
index ba4647e..3edb3e2 100755
--- a/lib/openbmc_ffdc_list.py
+++ b/lib/openbmc_ffdc_list.py
@@ -100,18 +100,7 @@
                    + '/tmp --label FFDC ; } >/tmp/OS_sosreport.txt 2>&1',
     },
 }
-# Add file name and correcponding command needed for RHEL Linux
-FFDC_OS_IBM_POWERKVM_FILE = {
-    'OS FILES':
-    {
-        # File Name         Command
-        'OS_secure': 'cat /var/log/secure >/tmp/OS_secure.txt 2>&1',
-        'OS_syslog': 'tail -n 200000 /var/log/messages '
-                     + '>/tmp/OS_syslog.txt 2>&1',
-        'OS_info': '{ lsb_release -a; uname -a; rpm -qa ; } '
-                   + '>/tmp/OS_info.txt 2>&1',
-    },
-}
+
 OPENBMC_BASE = '/xyz/openbmc_project/'
 OPENPOWER_BASE = '/org/open_power/'
 ENUMERATE_SENSORS = OPENBMC_BASE + 'sensors/enumerate'
diff --git a/redfish/extended/redfish_bmc_code_update.robot b/redfish/extended/redfish_bmc_code_update.robot
index a681904..3999882 100644
--- a/redfish/extended/redfish_bmc_code_update.robot
+++ b/redfish/extended/redfish_bmc_code_update.robot
@@ -85,7 +85,7 @@
     [Arguments]  ${image_version}
 
     # Description of argument(s):
-    # image_version       The Fimware image version (e.g. ibm-v.x-xx).
+    # image_version       The Fimware image version (e.g. 2.8.0-dev-1107-g512028d95).
 
     ${software_info}=  Read Properties
     ...  ${SOFTWARE_VERSION_URI}/enumerate  quiet=1
@@ -104,7 +104,7 @@
     [Arguments]  ${image_version}  ${software_inventory}
 
     # Description of argument(s):
-    # image_version       The Fimware image version (e.g. ibm-v.x-xx).
+    # image_version       The Fimware image version (e.g. 2.8.0-dev-1107-g512028d95).
     # software_inventory  Software inventory details.
 
     ${least_priority}=  Get Least Value Priority Image  ${VERSION_PURPOSE_BMC}