diff --git a/deploy/installer/cleanup/installscript.qs b/deploy/installer/cleanup/installscript.qs
index 27260233..46f8012c 100644
--- a/deploy/installer/cleanup/installscript.qs
+++ b/deploy/installer/cleanup/installscript.qs
@@ -13,11 +13,11 @@ Component.prototype.createOperations = function()
             /**
              * Cleanup AppData and registry
              */
-            component.addElevatedOperation("Execute","echo do nothing","UNDOEXECUTE","cmd /C reg delete HKEY_CURRENT_USER\Software\nheko\nheko /f");
+            component.addElevatedOperation("Execute","UNDOEXECUTE","cmd /C reg delete HKEY_CURRENT_USER\Software\nheko\nheko /f");
             var localappdata = installer.environmentVariable("LOCALAPPDATA");
             if( localappdata != "" )
             {
-                component.addElevatedOperation("Execute","echo do nothing","UNDOEXECUTE","cmd /C rmdir "+localappdata+"\nheko /f");
+                component.addElevatedOperation("Execute","UNDOEXECUTE","cmd /C rmdir "+localappdata+"\nheko /f");
             }
         }
     }
diff --git a/deploy/installer/cleanup/package.xml b/deploy/installer/cleanup/package.xml
index 8e99c97c..9c3182c0 100644
--- a/deploy/installer/cleanup/package.xml
+++ b/deploy/installer/cleanup/package.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Package>
     <DisplayName>Cleanup AppData and Registry</DisplayName>
-    <Description>Cleansup AppData and Registry when selected (logs you out)</Description>
+    <Description>Cleans up AppData and Registry when selected (logs you out)</Description>
     <Version>__VERSION__</Version>
     <ReleaseDate>__DATE__</ReleaseDate>
-    <Licenses>
-        <License name="GPLv3" file="license.txt" />
-    </Licenses>
     <Default>false</Default>
     <ForcedInstallation>false</ForcedInstallation>
     <SortingPriority>80</SortingPriority>
diff --git a/deploy/installer/gui/installscript.qs b/deploy/installer/gui/installscript.qs
index e007c42c..4cfa284f 100644
--- a/deploy/installer/gui/installscript.qs
+++ b/deploy/installer/gui/installscript.qs
@@ -23,22 +23,6 @@ Component.prototype.createOperations = function()
             component.addOperation( "CreateShortcut", "@TargetDir@\\nheko.exe", "@DesktopDir@\\nheko.lnk",
                                     "workingDirectory=@TargetDir@", "iconPath=@TargetDir@\\nheko.exe",
                                     "iconId=0", "description=Desktop client for the Matrix protocol");
-
-            /**
-             * Cleanup AppData and registry
-             */
-            if( installer.isUninstaller() )
-            {
-                component.addElevatedOperation("Execute","echo do nothing","UNDOEXECUTE","cmd /C reg delete HKEY_CURRENT_USER\Software\nheko\nheko\font /f");
-                component.addElevatedOperation("Execute","echo do nothing","UNDOEXECUTE","cmd /C reg delete HKEY_CURRENT_USER\Software\nheko\nheko\notifications /f");
-                component.addElevatedOperation("Execute","echo do nothing","UNDOEXECUTE","cmd /C reg delete HKEY_CURRENT_USER\Software\nheko\nheko\window /f");
-                var localappdata = installer.environmentVariable("LOCALAPPDATA");
-                if( localappdata != "" )
-                {
-
-                    component.addElevatedOperation("Execute","echo do nothing","UNDOEXECUTE","cmd /C rmdir "+localappdata+"\nheko /f");
-                }
-            }
         }
     }
     catch( e )
diff --git a/deploy/installer/gui/package.xml b/deploy/installer/gui/package.xml
index 8993c63d..c28b7e60 100644
--- a/deploy/installer/gui/package.xml
+++ b/deploy/installer/gui/package.xml
@@ -5,7 +5,7 @@
     <Version>__VERSION__</Version>
     <ReleaseDate>__DATE__</ReleaseDate>
     <Licenses>
-        <License name="GPLv3" file="license.txt" />
+        <License name="Nheko License - GPLv3" file="license.txt" />
     </Licenses>
     <Default>true</Default>
     <ForcedInstallation>true</ForcedInstallation>