diff --git a/.drone.yml.backup b/.drone.yml.backup
deleted file mode 100644
index 50ecca3..0000000
--- a/.drone.yml.backup
+++ /dev/null
@@ -1,16 +0,0 @@
-
-# Convert to WIM:
-#   tasks:
-#         scripts:
-#         # Download .vmdk
-#         - ${bamboo.build.working.directory}\bamboo-specs\scripts\Copy-DatastoreItem.ps1 -VMName ${bamboo.vmname}-physical -VSpherePassword "${bamboo.vspherepassword}"
-#         # Remove unsupported key from descriptor file
-#         - Set-Content -Path "${bamboo.vmname}-physical.vmdk" -Value (Get-Content -Path "${bamboo.vmname}-physical.vmdk" | Select-String -Pattern 'ddb\.toolsInstallType.*' -NotMatch)
-#         # Convert to .vhd
-#         - Import-Module ${bamboo.build.working.directory}\bamboo-specs\scripts\MVMC\MvmcCmdlet.psd1
-#         - ConvertTo-MvmcVirtualHardDisk -SourceLiteralPath "${bamboo.vmname}-physical.vmdk" -DestinationLiteralPath "${bamboo.vmname}-physical.vhd" -VhdType DynamicHardDisk -VhdFormat Vhd
-#         - Remove-Item *.vmdk
-#         # Convert to .wim
-#         - $MountPath = New-Item -Path "$PWD\Mount" -ItemType 'Directory' -Force
-#         - Mount-WindowsImage -ImagePath "${bamboo.vmname}-physical.vhd" -Path $MountPath.FullName -Index 1
-#         - ${bamboo.build.working.directory}\bamboo-specs\scripts\New-WindowsImageJob.ps1 -ImageName 'Server2019' -SourceFolder $MountPath.FullName -DestinationFile "$PWD\diskimage.wim"
diff --git a/packer/binaries/MicrosoftEdgeEnterpriseX64.mst b/packer/binaries/MicrosoftEdgeEnterpriseX64.mst
new file mode 100644
index 0000000..a608dc0
Binary files /dev/null and b/packer/binaries/MicrosoftEdgeEnterpriseX64.mst differ
diff --git a/packer/variables.vsphere.json b/packer/variables.vsphere.json
index 1de0c0b..8a2bcce 100644
--- a/packer/variables.vsphere.json
+++ b/packer/variables.vsphere.json
@@ -4,7 +4,7 @@
     "vsphere_datacenter":       "DeSchakel",
     "vsphere_host":             "bv11-esx.bessems.lan",
     "vsphere_hostip":           "192.168.11.200",
-    "vsphere_datastore":        "Datastore04.NAS",
+    "vsphere_datastore":        "Datastore01.SSD",
     "vsphere_folder":           "/Packer",
     "vsphere_templatefolder":   "/Templates",
     "vsphere_network":          "LAN"
diff --git a/packer/windowsserver2019.json b/packer/windowsserver2019.json
index cd56e2f..d6ba1d6 100644
--- a/packer/windowsserver2019.json
+++ b/packer/windowsserver2019.json
@@ -51,6 +51,7 @@
         "floppy_files": [
             "packer/preseed/Server2019/Autounattend.xml",
             "packer/preseed/Server2019/Sysprep_Unattend.xml",
+            "packer/binaries/MicrosoftEdgeEnterpriseX64.mst",
             "scripts/Set-NetworkProfile.ps1",
             "scripts/Disable-WinRM.ps1",
             "scripts/Enable-WinRM.ps1",
@@ -119,6 +120,7 @@
         "floppy_files": [
             "packer/preseed/Server2019/Autounattend.xml",
             "packer/preseed/Server2019/Sysprep_Unattend.xml",
+            "packer/binaries/MicrosoftEdgeEnterpriseX64.mst",
             "scripts/Set-NetworkProfile.ps1",
             "scripts/Disable-WinRM.ps1",
             "scripts/Enable-WinRM.ps1",
@@ -155,7 +157,7 @@
           "choco install -y dotnetfx",
           "choco install -y 7zip.install",
           "choco install -y sysinternals",
-          "choco install -y microsoft-edge"
+          "choco install -y microsoft-edge --install-arguments=\"TRANSFORMS=A:\\MicrosoftEdgeEnterpriseX64.mst\""
         ],
         "valid_exit_codes":     [0, 3010]
       },
diff --git a/scripts/Copy-DatastoreItem.ps1 b/scripts/Copy-DatastoreItem.ps1
deleted file mode 100644
index aa24a17..0000000
--- a/scripts/Copy-DatastoreItem.ps1
+++ /dev/null
@@ -1,52 +0,0 @@
-[CmdletBinding()]
-Param(
-    [Parameter(Mandatory)]
-    [string]$VMName,
-    [Parameter(Mandatory)]
-    [string]$VSphereFQDN,
-    [Parameter(Mandatory)]
-    [string]$VSphereUsername,
-    [Parameter(Mandatory)]
-    [string]$VSpherePassword
-)
-
-$PowerCliConfigurationSplat = @{
-    Scope                    = 'User'
-    ParticipateInCEIP        = $False
-    Confirm                  = $False
-    InvalidCertificateAction = 'Ignore'
-}
-Set-PowerCLIConfiguration @PowerCliConfigurationSplat | Out-Null
-
-$ConnectVIServerSplat = @{
-    Server        = $VSphereFQDN
-    User          = "$VSphereUsername"
-    Password      = "$VSpherePassword"
-    WarningAction = 'SilentlyContinue'
-}
-Connect-VIServer @ConnectVIServerSplat | Out-Null
-
-$GetVMSplat = @{
-    Name = $VMName
-}
-$VM = Get-VM @GetVMSplat
-
-$GetHarddiskSplat = @{
-    VM = $VM
-}
-$Harddisk = Get-Harddisk @GetHarddiskSplat
-$VMFolder = ($Harddisk.Filename.Substring(0, $Harddisk.Filename.LastIndexOf('/')) -split ' ')[1]
-
-$NewDatastoreDriveSplat = @{
-    Name      = 'ds'
-    Datastore = ($VM | Get-Datastore)
-}
-New-DatastoreDrive @NewDatastoreDriveSplat
-
-$CopyDatastoreItemSplat = @{
-    Item        = "ds:\$($VMFolder)\*.vmdk"
-    Destination = (Get-Item $PWD)
-}
-Copy-DatastoreItem @CopyDatastoreItemSplat
-
-Disconnect-VIServer * -Confirm:$False
\ No newline at end of file
diff --git a/scripts/MVMC/BlockList.xml b/scripts/MVMC/BlockList.xml
deleted file mode 100644
index d590aeb..0000000
--- a/scripts/MVMC/BlockList.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0"  encoding="utf-8" ?>
-<BlockList>
-    <!-- services to disable -->
-    <Services>
-		<Name>MVMCP2VAgent</Name>
-		<Name>VMTools</Name>
-		<Name> VMUpgradeHelper </Name>
-		<Name> vmvss </Name>
-        <Name>vmdesched</Name>
-        <Name>Virtual Server</Name>
-        <!-- Virtual Machine Helper -->
-        <Name>vmh</Name>
-        <!-- Xen-specific service -->
-        <Name>xensvc</Name>
-    </Services>
-    <!-- drivers to disable -->
-    <Drivers>
-        <Name>vmx_svga</Name>
-        <Name>vmmouse</Name>
-        <Name>vmscsi</Name>
-        <Name>amdpcn</Name>
-        <Name>PCnet</Name>
-        <Name>VMMEMCTL</Name>
-
-        <Name> pvscsi </Name>
-        <Name> vmci </Name>
-        <Name> vmmouse </Name>
-        <Name> vmaudio </Name>
-        <Name> vmrawdsk </Name>
-        <Name> vmxnet </Name>
-        <Name> vmxnet3ndis6 </Name>
-        <Name> vm3dmp </Name>
-        <Name> vmdebug </Name>
-        <Name> vmxnet3ndis5 </Name>
-
-        
-        <Name>cirrus</Name>
-        <!-- storage drivers -->
-        <Name>buslogic</Name>
-        <Name>symc810</Name>
-        <Name>cpqarray</Name>
-        <Name>pcntn4m</Name>
-        <Name>cpqnf3</Name>
-        <Name>MRaidNT</Name>
-        <Name>Symc8XX</Name>
-        <!-- VIA chipset drivers -->
-        <Name>viaide</Name>
-        <Name>VIAudio</Name>
-        <Name>VIAPFD</Name>
-        <Name>viafilter</Name>
-        <Name>viaagp</Name>
-        <Name>viaagp1</Name>
-        <!-- network drivers: Intel(R) PRO/100 -->
-        <Name>E100B</Name>
-        <!-- tape drivers -->
-        <Name>4mmdat</Name>
-        <Name>4mmdat-SeSFT</Name>
-        <Name>SCSIChanger</Name>
-
-        <!-- Virtual Machine Monitor -->
-        <Name>vmm</Name>
-        <!-- Xen-specific drivers -->
-        <Name>xenevtchn</Name>
-        <Name>xenvbd</Name>
-        <Name>xennet</Name>
-    </Drivers>
-    <Programs>
-        <Name>ProMON</Name>
-        <Name>s3tray2</Name>
-        <Name>VMwareTray</Name>
-        <Name>VMwareUser</Name>
-    </Programs>
-</BlockList>
\ No newline at end of file
diff --git a/scripts/MVMC/Microsoft.Accelerators.Framework.Core.dll b/scripts/MVMC/Microsoft.Accelerators.Framework.Core.dll
deleted file mode 100644
index 15ffdcb..0000000
Binary files a/scripts/MVMC/Microsoft.Accelerators.Framework.Core.dll and /dev/null differ
diff --git a/scripts/MVMC/Microsoft.Accelerators.Framework.dll b/scripts/MVMC/Microsoft.Accelerators.Framework.dll
deleted file mode 100644
index 714ec9b..0000000
Binary files a/scripts/MVMC/Microsoft.Accelerators.Framework.dll and /dev/null differ
diff --git a/scripts/MVMC/Microsoft.Accelerators.Mvmc.Engine.dll b/scripts/MVMC/Microsoft.Accelerators.Mvmc.Engine.dll
deleted file mode 100644
index ae32db5..0000000
Binary files a/scripts/MVMC/Microsoft.Accelerators.Mvmc.Engine.dll and /dev/null differ
diff --git a/scripts/MVMC/Microsoft.Accelerators.Mvmc.ScxSshCommon.dll b/scripts/MVMC/Microsoft.Accelerators.Mvmc.ScxSshCommon.dll
deleted file mode 100644
index 4dab6e8..0000000
Binary files a/scripts/MVMC/Microsoft.Accelerators.Mvmc.ScxSshCommon.dll and /dev/null differ
diff --git a/scripts/MVMC/Microsoft.Accelerators.Mvmc.ScxSshWrapper_x64.dll b/scripts/MVMC/Microsoft.Accelerators.Mvmc.ScxSshWrapper_x64.dll
deleted file mode 100644
index eab48e2..0000000
Binary files a/scripts/MVMC/Microsoft.Accelerators.Mvmc.ScxSshWrapper_x64.dll and /dev/null differ
diff --git a/scripts/MVMC/Microsoft.Accelerators.Mvmc.ScxSshWrapper_x86.dll b/scripts/MVMC/Microsoft.Accelerators.Mvmc.ScxSshWrapper_x86.dll
deleted file mode 100644
index 9adbdf0..0000000
Binary files a/scripts/MVMC/Microsoft.Accelerators.Mvmc.ScxSshWrapper_x86.dll and /dev/null differ
diff --git a/scripts/MVMC/Microsoft.Practices.ServiceLocation.dll b/scripts/MVMC/Microsoft.Practices.ServiceLocation.dll
deleted file mode 100644
index 330e60e..0000000
Binary files a/scripts/MVMC/Microsoft.Practices.ServiceLocation.dll and /dev/null differ
diff --git a/scripts/MVMC/Microsoft.Practices.Unity.dll b/scripts/MVMC/Microsoft.Practices.Unity.dll
deleted file mode 100644
index b3ca3ce..0000000
Binary files a/scripts/MVMC/Microsoft.Practices.Unity.dll and /dev/null differ
diff --git a/scripts/MVMC/Microsoft.Samples.WindowsAzure.ServiceManagement.dll b/scripts/MVMC/Microsoft.Samples.WindowsAzure.ServiceManagement.dll
deleted file mode 100644
index a07b399..0000000
Binary files a/scripts/MVMC/Microsoft.Samples.WindowsAzure.ServiceManagement.dll and /dev/null differ
diff --git a/scripts/MVMC/Microsoft.WindowsAzure.Management.CloudService.dll b/scripts/MVMC/Microsoft.WindowsAzure.Management.CloudService.dll
deleted file mode 100644
index dcc2e64..0000000
Binary files a/scripts/MVMC/Microsoft.WindowsAzure.Management.CloudService.dll and /dev/null differ
diff --git a/scripts/MVMC/Microsoft.WindowsAzure.Management.ConsoleAppUtils.dll b/scripts/MVMC/Microsoft.WindowsAzure.Management.ConsoleAppUtils.dll
deleted file mode 100644
index d7762a3..0000000
Binary files a/scripts/MVMC/Microsoft.WindowsAzure.Management.ConsoleAppUtils.dll and /dev/null differ
diff --git a/scripts/MVMC/Microsoft.WindowsAzure.Management.Service.dll b/scripts/MVMC/Microsoft.WindowsAzure.Management.Service.dll
deleted file mode 100644
index d3e036d..0000000
Binary files a/scripts/MVMC/Microsoft.WindowsAzure.Management.Service.dll and /dev/null differ
diff --git a/scripts/MVMC/Microsoft.WindowsAzure.Management.ServiceBus.dll b/scripts/MVMC/Microsoft.WindowsAzure.Management.ServiceBus.dll
deleted file mode 100644
index 3353bc9..0000000
Binary files a/scripts/MVMC/Microsoft.WindowsAzure.Management.ServiceBus.dll and /dev/null differ
diff --git a/scripts/MVMC/Microsoft.WindowsAzure.Management.ServiceManagement.dll b/scripts/MVMC/Microsoft.WindowsAzure.Management.ServiceManagement.dll
deleted file mode 100644
index 7aae384..0000000
Binary files a/scripts/MVMC/Microsoft.WindowsAzure.Management.ServiceManagement.dll and /dev/null differ
diff --git a/scripts/MVMC/Microsoft.WindowsAzure.Management.SqlDatabase.dll b/scripts/MVMC/Microsoft.WindowsAzure.Management.SqlDatabase.dll
deleted file mode 100644
index 69839bf..0000000
Binary files a/scripts/MVMC/Microsoft.WindowsAzure.Management.SqlDatabase.dll and /dev/null differ
diff --git a/scripts/MVMC/Microsoft.WindowsAzure.Management.Sync.dll b/scripts/MVMC/Microsoft.WindowsAzure.Management.Sync.dll
deleted file mode 100644
index 3e5cd36..0000000
Binary files a/scripts/MVMC/Microsoft.WindowsAzure.Management.Sync.dll and /dev/null differ
diff --git a/scripts/MVMC/Microsoft.WindowsAzure.Management.Tools.Vhd.dll b/scripts/MVMC/Microsoft.WindowsAzure.Management.Tools.Vhd.dll
deleted file mode 100644
index 4e138ae..0000000
Binary files a/scripts/MVMC/Microsoft.WindowsAzure.Management.Tools.Vhd.dll and /dev/null differ
diff --git a/scripts/MVMC/Microsoft.WindowsAzure.Management.Websites.dll b/scripts/MVMC/Microsoft.WindowsAzure.Management.Websites.dll
deleted file mode 100644
index bf1863d..0000000
Binary files a/scripts/MVMC/Microsoft.WindowsAzure.Management.Websites.dll and /dev/null differ
diff --git a/scripts/MVMC/Microsoft.WindowsAzure.Management.dll b/scripts/MVMC/Microsoft.WindowsAzure.Management.dll
deleted file mode 100644
index febdfcf..0000000
Binary files a/scripts/MVMC/Microsoft.WindowsAzure.Management.dll and /dev/null differ
diff --git a/scripts/MVMC/Microsoft.WindowsAzure.Storage.dll b/scripts/MVMC/Microsoft.WindowsAzure.Storage.dll
deleted file mode 100644
index 0d29d8d..0000000
Binary files a/scripts/MVMC/Microsoft.WindowsAzure.Storage.dll and /dev/null differ
diff --git a/scripts/MVMC/MvmcCmdlet.dll b/scripts/MVMC/MvmcCmdlet.dll
deleted file mode 100644
index 5cef267..0000000
Binary files a/scripts/MVMC/MvmcCmdlet.dll and /dev/null differ
diff --git a/scripts/MVMC/MvmcCmdlet.psd1 b/scripts/MVMC/MvmcCmdlet.psd1
deleted file mode 100644
index a2be3f7..0000000
Binary files a/scripts/MVMC/MvmcCmdlet.psd1 and /dev/null differ
diff --git a/scripts/MVMC/Sshlib_x64.dll b/scripts/MVMC/Sshlib_x64.dll
deleted file mode 100644
index ce68651..0000000
Binary files a/scripts/MVMC/Sshlib_x64.dll and /dev/null differ
diff --git a/scripts/MVMC/Sshlib_x86.dll b/scripts/MVMC/Sshlib_x86.dll
deleted file mode 100644
index 4658589..0000000
Binary files a/scripts/MVMC/Sshlib_x86.dll and /dev/null differ
diff --git a/scripts/MVMC/System.Reactive.Core.dll b/scripts/MVMC/System.Reactive.Core.dll
deleted file mode 100644
index b893f83..0000000
Binary files a/scripts/MVMC/System.Reactive.Core.dll and /dev/null differ
diff --git a/scripts/MVMC/System.Reactive.Interfaces.dll b/scripts/MVMC/System.Reactive.Interfaces.dll
deleted file mode 100644
index 3dbb203..0000000
Binary files a/scripts/MVMC/System.Reactive.Interfaces.dll and /dev/null differ
diff --git a/scripts/MVMC/System.Reactive.Linq.dll b/scripts/MVMC/System.Reactive.Linq.dll
deleted file mode 100644
index 35d022a..0000000
Binary files a/scripts/MVMC/System.Reactive.Linq.dll and /dev/null differ
diff --git a/scripts/MVMC/System.Reactive.PlatformServices.dll b/scripts/MVMC/System.Reactive.PlatformServices.dll
deleted file mode 100644
index 77f2db4..0000000
Binary files a/scripts/MVMC/System.Reactive.PlatformServices.dll and /dev/null differ
diff --git a/scripts/MVMC/System.Reactive.Providers.dll b/scripts/MVMC/System.Reactive.Providers.dll
deleted file mode 100644
index fabc533..0000000
Binary files a/scripts/MVMC/System.Reactive.Providers.dll and /dev/null differ
diff --git a/scripts/MVMC/System.Reactive.Windows.Threading.dll b/scripts/MVMC/System.Reactive.Windows.Threading.dll
deleted file mode 100644
index 1c7840f..0000000
Binary files a/scripts/MVMC/System.Reactive.Windows.Threading.dll and /dev/null differ
diff --git a/scripts/New-WindowsImageJob.ps1 b/scripts/New-WindowsImageJob.ps1
deleted file mode 100644
index 634d41e..0000000
--- a/scripts/New-WindowsImageJob.ps1
+++ /dev/null
@@ -1,51 +0,0 @@
-#Requires -Modules 'dism'
-Param(
-    [Parameter(Mandatory)]
-    [string]$ImageName,
-    [Parameter(Mandatory)]
-    [string]$SourceFolder,
-    [Parameter(Mandatory)]
-    [string]$DestinationFile
-)
-
-$StartJobSplat = @{
-    ArgumentList = $ImageName, $SourceFolder, $DestinationFile
-    ScriptBlock  = {
-        Param(
-            $ImageName,
-            $SourceFolder,
-            $DestinationFile
-        )
-
-        $NewWindowsImageSplat = @{
-            Name        = $ImageName
-            CapturePath = $SourceFolder
-            ImagePath   = $DestinationFile
-            Verify      = $True
-        }
-        New-WindowsImage @NewWindowsImageSplat
-        }
-}
-$Job = Start-Job @StartJobSplat
-
-While ($Job.State -eq 'Running') {
-    $GetItemSplat = @{
-        Path        = $DestinationFile
-        ErrorAction = 'SilentlyContinue'
-    }
-    $OutputFile = Get-Item @GetItemSplat
-    If ($OutputFile) {
-        Write-Host "Export in progress ... $($OutputFile.FullName); Size: $('{0:n2}' -f ($OutputFile.Length / 1MB))MB"
-    }
-    Else {
-        Write-Host "Export initiating ... "
-    }
-
-    $StartSleepSplat = @{
-        Seconds = 30
-    }
-    Start-Sleep @StartSleepSplat
-}
-
-Receive-Job $Job
-Remove-Job $Job
\ No newline at end of file
diff --git a/scripts/Uninstall-VMwareTools.Sysprep.cmd b/scripts/Uninstall-VMwareTools.Sysprep.cmd
deleted file mode 100644
index f75b7a5..0000000
--- a/scripts/Uninstall-VMwareTools.Sysprep.cmd
+++ /dev/null
@@ -1,7 +0,0 @@
-@rem Uninstall VMware Tools
-@rem (wait for orphaned child process to finish)
-@rem Silent mode, basic UI, no reboot
-start "Uninstall VMware Tools" /b /w e:\setup64 /s /v "/qb REBOOT=R REMOVE=ALL"
-
-@rem Initiate Sysprep
-C:\Windows\System32\Sysprep\sysprep.exe /generalize /oobe /unattend:A:\Sysprep_Unattend.xml /quiet /shutdown
\ No newline at end of file