diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/vi_client.rb b/src/vmm_mad/remotes/lib/vcenter_driver/vi_client.rb
index 140ece9158..72617f6408 100644
--- a/src/vmm_mad/remotes/lib/vcenter_driver/vi_client.rb
+++ b/src/vmm_mad/remotes/lib/vcenter_driver/vi_client.rb
@@ -13,7 +13,6 @@
 # See the License for the specific language governing permissions and        #
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
-
 require 'openssl'
 require 'yaml'
 
@@ -48,7 +47,7 @@ class VIClient
     end
 
     def load_vcenter_configuration
-        vcenter_conf = YAML::load(File.open("/etc/one/vcenter_driver.conf"))
+        vcenter_conf = YAML::load(File.open("#{ETC_LOCATION}/vcenter_driver.conf"))
         vcenter_conf
     end
 
diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb b/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb
index 2393d2e0e2..2c0cdd6fbd 100644
--- a/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb
+++ b/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb
@@ -1483,6 +1483,7 @@ class VirtualMachine < Template
         return self['_ref']
     end
 
+    #The exception will be handle outside this method
     def wait_deploy_timeout
         timeout_deploy = @vi_client.get_property_vcenter_conf(:vm_poweron_wait_default)
         time_start = Time.now
diff --git a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb
index e799669d94..0c00ff8c35 100644
--- a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb
+++ b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb
@@ -92,15 +92,4 @@ def check_item(item, target_class)
     rescue RbVmomi::Fault => e
         raise "Reference \"#{item._ref}\" error [#{e.message}]. The reference does not exist"
     end
-end
-
-def wait_deploy_timeout(vm, timeout_deploy = 300)
-    time_start = Time.now
-    begin
-        time_running = Time.now - time_start
-        raise 'reached deploy timeout' if time_running.to_i >= timeout_deploy
-
-        sleep(2)
-        state = vm.item.summary.runtime.powerState
-    end until(state == "poweredOn")
 end
\ No newline at end of file