diff --git a/CLIENT_DATA/cleanup3264.ins b/CLIENT_DATA/cleanup3264.ins
index 39bf217..2520346 100644
--- a/CLIENT_DATA/cleanup3264.ins
+++ b/CLIENT_DATA/cleanup3264.ins
@@ -1,29 +1,57 @@
-DefStringList $productProperty$
-
 DefVar  $reboot$
 Set     $reboot$ = "false"
 
 if ($sereby_dotnet1.1$ = "reinstall")
+    if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{E78BFA60-5393-4C38-82AB-E8019E464EB4}] DisplayName") = "")
+        comment "MSI id " + $MsiId32$ + " found in registry, starting msiexec to uninstall"
+        Winbatch_uninstall_msi_net11_deu_32
+        sub_check_exitcode
+    endif
     Winbatch_dotnet1.1_uninstall
     opsiservicecall_dotnet1.1_uninstall
     Set $reboot$ = "true"
 endif
 if ($sereby_dotnet2.0$ = "reinstall")
+    if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{C314CE45-3392-3B73-B4E1-139CD41CA933}] DisplayName") = "")
+        comment "MSI id " + $MsiId32$ + " found in registry, starting msiexec to uninstall"
+        Winbatch_uninstall_msi_net20_deu_32
+        sub_check_exitcode
+    endif
     Winbatch_dotnet2.0_uninstall
     opsiservicecall_dotnet2.0_uninstall
     Set $reboot$ = "true"
 endif
 if ($sereby_dotnet3.0$ = "reinstall")
+    if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{C2C284D2-6BD7-3B34-B0C5-B2CAED168DF7}] DisplayName") = "")
+        comment "MSI id " + $MsiId32$ + " found in registry, starting msiexec to uninstall"
+        Winbatch_uninstall_msi_net30_deu_32
+        sub_check_exitcode
+    endif
     Winbatch_dotnet3.0_uninstall
     opsiservicecall_dotnet3.0_uninstall
     Set $reboot$ = "true"
 endif
 if ($sereby_dotnet3.5$ = "reinstall")
+    if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{052FDD78-A6EA-3187-8386-C82F4CA3A929}] DisplayName") = "")
+	comment "MSI id " + $MsiId32$ + " found in registry, starting msiexec to uninstall"
+        Winbatch_uninstall_msi_net35_deu_32
+        sub_check_exitcode
+    endif
     Winbatch_dotnet3.5_uninstall
     opsiservicecall_dotnet3.5_uninstall
     Set $reboot$ = "true"
 endif
 if ($sereby_dotnet4.0$ = "reinstall")
+    if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{C911A0C2-2236-3164-AA47-F2566C01AE5E}] DisplayName") = "")
+        comment "MSI id " + $MsiId32$ + " found in registry, starting msiexec to uninstall"
+        Winbatch_uninstall_msi_net40_extended_deu_32
+        sub_check_exitcode
+    endif
+    if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{F750C986-5310-3A5A-95F8-4EC71C8AC01C}] DisplayName") = "")
+        comment "MSI id " + $MsiId32$ + " found in registry, starting msiexec to uninstall"
+        Winbatch_uninstall_msi_net40_client_deu_32
+        sub_check_exitcode
+    endif
     Winbatch_dotnet4.0_uninstall
     opsiservicecall_dotnet4.0_uninstall
     Set $reboot$ = "true"
@@ -275,4 +303,24 @@ $UninstallFlashExe$ -uninstall
 "%opsiserviceUser%"
 ]
 
+; windows xp dotnet bug uninstall 
+; uninstall all languages and then remove .net
+[Winbatch_uninstall_msi_net35_deu_32]
+msiexec /x {052FDD78-A6EA-3187-8386-C82F4CA3A929} /qb! REBOOT=ReallySuppress
+
+[Winbatch_uninstall_msi_net30_deu_32]
+msiexec /x {C2C284D2-6BD7-3B34-B0C5-B2CAED168DF7} /qb! REBOOT=ReallySuppress
+
+[Winbatch_uninstall_msi_net20_deu_32]
+msiexec /x {C314CE45-3392-3B73-B4E1-139CD41CA933} /qb! REBOOT=ReallySuppress
+
+[Winbatch_uninstall_msi_net11_deu_32]
+msiexec /x {E78BFA60-5393-4C38-82AB-E8019E464EB4} /qb! REBOOT=ReallySuppress
+
+[Winbatch_uninstall_msi_net40_extended_deu_32]
+msiexec /x {C911A0C2-2236-3164-AA47-F2566C01AE5E} /qb! REBOOT=ReallySuppress
+
+[Winbatch_uninstall_msi_net40_client_deu_32]
+msiexec /x {F750C986-5310-3A5A-95F8-4EC71C8AC01C} /qb! REBOOT=ReallySuppress
+