Add upstream changes in cleanup step

scripts/Remove-Resources.ps1

@@ -16,7 +16,7 @@ $PowerCliConfigurationSplat = @{
     Confirm                  = $False
     InvalidCertificateAction = 'Ignore'
 }
-Set-PowerCLIConfiguration @PowerCliConfigurationSplat
+Set-PowerCLIConfiguration @PowerCliConfigurationSplat | Out-Null
 
 $ConnectVIServerSplat = @{
     Server        = $VSphereFQDN
@@ -26,14 +26,26 @@ $ConnectVIServerSplat = @{
 }
 Connect-VIServer @ConnectVIServerSplat | Out-Null
 
-$RemoveVMSplat = @{
+$GetVMSplat = @{
-    VM                       = "$($VMName)*"
+    Name        = "*$($VMName)*"
-    DeletePermanently        = $True
+    ErrorAction = 'SilentlyContinue'
-    Confirm                  = $False
+}
-    ErrorAction              = 'SilentlyContinue'
+If ([boolean](Get-VM @GetVMSplat)) {
+    $RemoveVMSplat = @{
+        VM                       = Get-VM @GetVMSplat
+        DeletePermanently        = $True
+        Confirm                  = $False
+        ErrorAction              = 'SilentlyContinue'
+    }
+    Remove-VM @RemoveVMSplat
 }
-Remove-VM @RemoveVMSplat
 
-# Also delete ISO/floppy?
+Disconnect-VIServer * -Confirm:$False
 
-Disconnect-VIServer * -Confirm:$False
+$RemoveItemSplat = @{
+    Path    = "/scratch/*"
+    Recurse = $True
+    Force   = $True
+    Confirm = $False
+}
+Remove-Item @RemoveItemSplat