diff --git a/uppsrc/Core/Win32Util.cpp b/uppsrc/Core/Win32Util.cpp
index ef34fcf36..30bd82014 100644
--- a/uppsrc/Core/Win32Util.cpp
+++ b/uppsrc/Core/Win32Util.cpp
@@ -147,7 +147,11 @@ void DeleteWinReg(const String& key, HKEY base, dword wow) {
 	RegCloseKey(hkey);
 	while(!subkeys.IsEmpty())
 		DeleteWinReg(key + '\\' + subkeys.Pop(), base);
-	if(wow)
+
+	static LONG (WINAPI *RegDeleteKeyEx)(HKEY, LPCTSTR, REGSAM, DWORD);
+	DllFn(RegDeleteKeyEx, "Advapi32.dll", "RegDeleteKeyExA");
+
+	if(wow && RegDeleteKeyEx)
 		RegDeleteKeyEx(base, key, wow, 0);
 	else
 		RegDeleteKey(base, key);
diff --git a/uppsrc/ide/InstantSetup.cpp b/uppsrc/ide/InstantSetup.cpp
index 395999979..58597e0da 100644
--- a/uppsrc/ide/InstantSetup.cpp
+++ b/uppsrc/ide/InstantSetup.cpp
@@ -92,29 +92,6 @@ void InstantSetup()
 {
 	DirFinder df;
 
-#if 0
-	Array<FileSystemInfo::FileInfo> root = StdFileSystemInfo().Find(Null);
-	for(int i = 0; i < root.GetCount(); i++) {
-		if(root[i].root_style == FileSystemInfo::ROOT_FIXED) {
-			int drive = *root[i].filename;
-			String pf = GetProgramsFolderX86();
-			pf.Set(0, drive);
-			df.Dir(pf + "/microsoft visual studio 14.0/vc/bin");
-			df.Dir(pf + "/windows kits/10");
-			df.Dir(pf + "/windows kits/8.1");
-			df.Dir(pf + "/windows kits");
-			df.Dir(pf + "/microsoft visual studio 14.0");
-			df.Dir(pf);
-			pf = GetProgramsFolder();
-			pf.Set(0, drive);
-			df.Dir(pf);
-		}
-	}
-	for(int i = 0; i < root.GetCount(); i++)
-		if(root[i].root_style == FileSystemInfo::ROOT_FIXED)
-			df.Dir(root[i].filename);
-#endif
-
 	String default_method;
 	
 	bool dirty = false;