diff --git a/lib/ipmi_client.robot b/lib/ipmi_client.robot
index e7d96b4..e043a9e 100755
--- a/lib/ipmi_client.robot
+++ b/lib/ipmi_client.robot
@@ -1,26 +1,21 @@
 *** Settings ***
-Documentation           This module is for IPMI client for copying ipmitool to
-...                     openbmc box and execute ipmitool commands.
+Documentation   This module is for IPMI client for copying ipmitool to
+...             openbmc box and execute ipmitool commands.
 
 Resource        ../lib/resource.txt
-
-Library                SSHLibrary
-Library                OperatingSystem
+Resource        ../lib/connection_client.robot
 
 *** Keywords ***
-Open Connection And Log In
-    Open connection     ${OPENBMC_HOST}
-    Login   ${OPENBMC_USERNAME}    ${OPENBMC_PASSWORD}
-    Copy ipmitool
-
 Run IPMI Command
     [arguments]    ${args}
+    Copy ipmitool
     ${output}   ${stderr}=  Execute Command    /tmp/ipmitool -I dbus raw ${args}  return_stderr=True
     Should Be Empty 	${stderr}
     set test variable    ${OUTPUT}     "${output}"
 
 Run IPMI Standard Command
     [arguments]    ${args}
+    Copy ipmitool
     ${stdout}    ${stderr}    ${output}=  Execute Command    /tmp/ipmitool -I dbus ${args}    return_stdout=True    return_stderr= True    return_rc=True
     Should Be Equal    ${output}    ${0}    msg=${stderr}
     [return]    ${stdout}