Making sure Get-ViewAPIService is there.

Modules/VMware.Hv.Helper/VMware.HV.Helper.psm1

@@ -10040,16 +10040,12 @@ function Remove-HVMachine(){
 		$HVServer = $null
 	  )
 
-if($HVServer){
-
-    $hvapi = ($global:DefaultHVServers| where {$_.name -imatch $HVServer }).extensiondata
-
-}
-
-else {
-
-    $hvapi = $global:DefaultHVServers.ExtensionData
+#Connect to HV Server
+$services = Get-ViewAPIService -HVServer $HVServer
   
+  if ($null -eq $services) {
+	  Write-Error "Could not retrieve ViewApi services from connection object"
+		break
 	  }
 
 #Connect to Query Service