diff --git a/bin/plug_ins/Auto_reboot/cp_master b/bin/plug_ins/Auto_reboot/cp_master
index 8f12588..94264d3 100755
--- a/bin/plug_ins/Auto_reboot/cp_master
+++ b/bin/plug_ins/Auto_reboot/cp_master
@@ -92,8 +92,6 @@
         OPENBMC_HOST,
         SSH_PORT,
         HTTPS_PORT,
-        REST_USERNAME,
-        REST_PASSWORD,
         OPENBMC_USERNAME,
         OPENBMC_PASSWORD,
         IPMI_USERNAME,
diff --git a/bin/plug_ins/Soft_errors/cp_post_boot b/bin/plug_ins/Soft_errors/cp_post_boot
index 649fd31..56ae896 100755
--- a/bin/plug_ins/Soft_errors/cp_post_boot
+++ b/bin/plug_ins/Soft_errors/cp_post_boot
@@ -129,8 +129,6 @@
         OPENBMC_HOST,
         SSH_PORT,
         HTTPS_PORT,
-        REST_USERNAME,
-        REST_PASSWORD,
         OPENBMC_USERNAME,
         OPENBMC_PASSWORD,
         keyword_string,
diff --git a/bin/plug_ins/Stop/cp_stop_check b/bin/plug_ins/Stop/cp_stop_check
index 1afb3f5..a6ca0d1 100755
--- a/bin/plug_ins/Stop/cp_stop_check
+++ b/bin/plug_ins/Stop/cp_stop_check
@@ -129,8 +129,6 @@
         OPENBMC_HOST,
         SSH_PORT,
         HTTPS_PORT,
-        REST_USERNAME,
-        REST_PASSWORD,
         OPENBMC_USERNAME,
         OPENBMC_PASSWORD,
         REDFISH_SUPPORT_TRANS_STATE,
diff --git a/lib/resource.robot b/lib/resource.robot
index 711f8e5..44012a7 100755
--- a/lib/resource.robot
+++ b/lib/resource.robot
@@ -28,8 +28,6 @@
 ${AUTH_URI}       https://${OPENBMC_HOST}${AUTH_SUFFIX}
 ${OPENBMC_USERNAME}    root
 ${OPENBMC_PASSWORD}    0penBmc
-${REST_USERNAME}       root
-${REST_PASSWORD}       0penBmc
 ${OPENBMC_ADMIN_USERNAME}  admin
 ${OPENBMC_ADMIN_PASSWORD}  ${EMPTY}
 ${SERVICE_USER_PASSWORD}   ${EMPTY}
diff --git a/lib/rest_client.robot b/lib/rest_client.robot
index 2ebbd14..8d5792e 100644
--- a/lib/rest_client.robot
+++ b/lib/rest_client.robot
@@ -131,8 +131,8 @@
 Initialize OpenBMC
     [Documentation]  Do a REST login connection within specified time.
     [Arguments]  ${timeout}=20  ${quiet}=${1}
-    ...  ${rest_username}=${REST_USERNAME}
-    ...  ${rest_password}=${REST_PASSWORD}
+    ...  ${rest_username}=${OPENBMC_USERNAME}
+    ...  ${rest_password}=${OPENBMC_PASSWORD}
 
     # Description of argument(s):
     # timeout        REST login attempt time out.
@@ -153,8 +153,8 @@
 
 BMC Web Login Request
     [Documentation]  Do BMC web-based login.
-    [Arguments]  ${timeout}=20  ${rest_username}=${REST_USERNAME}
-    ...  ${rest_password}=${REST_PASSWORD}
+    [Arguments]  ${timeout}=20  ${rest_username}=${OPENBMC_USERNAME}
+    ...  ${rest_password}=${OPENBMC_PASSWORD}
 
     # Description of argument(s):
     # timeout        REST login attempt time out.
@@ -182,8 +182,8 @@
 Post Login Request
     [Documentation]  Do REST login request.
     [Arguments]  ${timeout}=20  ${quiet}=${1}
-    ...  ${rest_username}=${REST_USERNAME}
-    ...  ${rest_password}=${REST_PASSWORD}
+    ...  ${rest_username}=${OPENBMC_USERNAME}
+    ...  ${rest_password}=${OPENBMC_PASSWORD}
 
     # Description of argument(s):
     # timeout        REST login attempt time out.
@@ -377,8 +377,8 @@
 
 Redfish Login
     [Documentation]  Do BMC web-based login.
-    [Arguments]  ${timeout}=20  ${rest_username}=${REST_USERNAME}
-    ...  ${rest_password}=${REST_PASSWORD}  ${kwargs}=${EMPTY}
+    [Arguments]  ${timeout}=20  ${rest_username}=${OPENBMC_USERNAME}
+    ...  ${rest_password}=${OPENBMC_PASSWORD}  ${kwargs}=${EMPTY}
 
     # Description of argument(s):
     # timeout        REST login attempt time out.
diff --git a/tests/test_remote_logging.robot b/tests/test_remote_logging.robot
index 580442a..b6be429 100644
--- a/tests/test_remote_logging.robot
+++ b/tests/test_remote_logging.robot
@@ -225,7 +225,7 @@
     ${bmc_journald}  ${stderr}  ${rc}=  BMC Execute Command
     ...  journalctl -o json-pretty | cat
 
-    Should Not Contain Any  ${bmc_journald}  ${OPENBMC_PASSWORD}  ${REST_PASSWORD}  ${valid_password}
+    Should Not Contain Any  ${bmc_journald}  ${OPENBMC_PASSWORD}  ${valid_password}
     ...  ignore_case=False  msg=Journald logs BMC credentials/password ${OPENBMC_PASSWORD}.