diff --git a/images/win/post-generation/AzureRegistrySettings.ps1 b/images/win/post-generation/AzureRegistrySettings.ps1
deleted file mode 100644
index e3a62d37..00000000
--- a/images/win/post-generation/AzureRegistrySettings.ps1
+++ /dev/null
@@ -1,7 +0,0 @@
-$ErrorActionPreference="Stop"
-
-# Remove 3 registry settings that are left behind when sysprepping. Having those registry settings together with a
-# race condition that kicks in when trying to run custom scripts extensions and stops us from reimaging machines.
-Remove-ItemProperty -Path 'Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Azure\HandlerState' -Name 'Incarnation' -Force  -ErrorAction Ignore
-Remove-ItemProperty -Path 'Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Azure\HandlerState' -Name 'InVmSvdSeqNo' -Force  -ErrorAction Ignore
-Remove-ItemProperty -Path 'Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Azure\HandlerState' -Name 'LastGoalStateMethod' -Force  -ErrorAction Ignore
diff --git a/images/win/post-generation/DotnetPath.ps1 b/images/win/post-generation/Dotnet.ps1
similarity index 100%
rename from images/win/post-generation/DotnetPath.ps1
rename to images/win/post-generation/Dotnet.ps1
diff --git a/images/win/post-generation/MercurialPath.ps1 b/images/win/post-generation/MercurialPath.ps1
deleted file mode 100644
index 7847d714..00000000
--- a/images/win/post-generation/MercurialPath.ps1
+++ /dev/null
@@ -1,8 +0,0 @@
-$hgPath = "$Env:ProgramFiles\Mercurial\"
-$latestPath = [System.Environment]::GetEnvironmentVariable('PATH', [System.EnvironmentVariableTarget]::Machine)
-
-if (Test-Path -Path $hgPath)
-{
-    $latestPath = "$hgPath;$latestPath"
-    Write-Host "Added Mercurial to PATH"
-}