Attempting to delete ascom profile entries on uninstall

Meade.net.Setup/AscomLocalServer.wxs

@@ -35,7 +35,7 @@
         <![CDATA[(NOT Installed)]]>
       </Custom>
       <Custom Action="UnRegisterEXE" After='RegisterEXE'>
-        <![CDATA[(REMOVE ~= "ALL")]]>
+        <![CDATA[(REMOVE ~= "ALL" AND NOT UPGRADINGPRODUCTCODE)]]>
       </Custom>
     </InstallExecuteSequence>
   </Fragment>

Meade.net/LocalServer.cs

@@ -487,11 +487,7 @@ namespace ASCOM.Meade.net
                     //
                     // ASCOM
                     //
-                    using (var p = new Profile())
+                    Registry.LocalMachine.DeleteSubKey(String.Format("SOFTWARE\\ASCOM\\{0} Drivers\\{1}", deviceType, progid), false);
-                    {
-                        p.DeviceType = deviceType;
-                        p.Unregister(progid);
-                    }
                 }
                 catch (Exception) { }
             }