diff --git a/appveyor.yml b/appveyor.yml
index 83305a28..55d518be 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -77,25 +77,19 @@ after_build:
     - mkdir installer\packages\io.github.nhekoreborn.nheko
     - mkdir installer\packages\io.github.nhekoreborn.nheko\data
     - mkdir installer\packages\io.github.nhekoreborn.nheko\meta
-    - mkdir installer\packages\io.github.nhekoreborn.nheko.cleanup\meta
     # Copy installer data
     - copy %BUILD%\resources\nheko.ico installer\config
     - copy %BUILD%\resources\nheko.png installer\config
     - copy %BUILD%\COPYING installer\packages\io.github.nhekoreborn.nheko\meta\license.txt
-    - copy %BUILD%\COPYING installer\packages\io.github.nhekoreborn.nheko.cleanup\meta\license.txt
     - copy %BUILD%\deploy\installer\config.xml installer\config
     - copy %BUILD%\deploy\installer\controlscript.qs installer\config
     - copy %BUILD%\deploy\installer\uninstall.qs installer\packages\io.github.nhekoreborn.nheko\data
     - copy %BUILD%\deploy\installer\gui\package.xml installer\packages\io.github.nhekoreborn.nheko\meta
     - copy %BUILD%\deploy\installer\gui\installscript.qs installer\packages\io.github.nhekoreborn.nheko\meta
-    - copy %BUILD%\deploy\installer\cleanup\package.xml installer\packages\io.github.nhekoreborn.nheko.cleanup\meta
-    - copy %BUILD%\deploy\installer\cleanup\installscript.qs installer\packages\io.github.nhekoreborn.nheko.cleanup\meta
     # Amend version and date
     - sed -i "s/__VERSION__/0.8.1/" installer\config\config.xml
     - sed -i "s/__VERSION__/0.8.1/" installer\packages\io.github.nhekoreborn.nheko\meta\package.xml
-    - sed -i "s/__VERSION__/0.8.1/" installer\packages\io.github.nhekoreborn.nheko.cleanup\meta\package.xml
     - sed -i "s/__DATE__/%DATE%/" installer\packages\io.github.nhekoreborn.nheko\meta\package.xml
-    - sed -i "s/__DATE__/%DATE%/" installer\packages\io.github.nhekoreborn.nheko.cleanup\meta\package.xml
     # Copy nheko data
     - xcopy NhekoData\*.* installer\packages\io.github.nhekoreborn.nheko\data\*.* /s /e /c /y
     - move NhekoRelease\nheko.exe installer\packages\io.github.nhekoreborn.nheko\data
@@ -107,7 +101,8 @@ after_build:
     - set PATH=%BUILD%\tools\bin;%PATH%
     - binarycreator.exe -f -c installer\config\config.xml -p installer\packages nheko-installer.exe
 
-    - mv nheko-installer.exe nheko-%APPVEYOR_REPO_TAG_NAME%-installer.exe
+    - copy nheko-installer.exe nheko-%APPVEYOR_REPO_TAG_NAME%-installer.exe
+    - copy nheko-installer.exe nheko-%APPVEYOR_PULL_REQUEST_HEAD_COMMIT%-installer.exe
     - ps: .\.ci\upload-nightly.ps1
 
 on_success:
@@ -127,3 +122,4 @@ deploy:
 artifacts:
     - path: nheko_win_64.zip
     - path: nheko-$(APPVEYOR_REPO_TAG_NAME)-installer.exe
+    - path: nheko-$(APPVEYOR_PULL_REQUEST_HEAD_COMMIT)-installer.exe
diff --git a/deploy/installer/cleanup/installscript.qs b/deploy/installer/cleanup/installscript.qs
deleted file mode 100644
index 46f8012c..00000000
--- a/deploy/installer/cleanup/installscript.qs
+++ /dev/null
@@ -1,28 +0,0 @@
-function Component()
-{
-}
-
-Component.prototype.createOperations = function()
-{
-    component.createOperations();
-
-    try
-    {
-        if( installer.value("os") === "win" )
-        {
-            /**
-             * Cleanup AppData and registry
-             */
-            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","UNDOEXECUTE","cmd /C rmdir "+localappdata+"\nheko /f");
-            }
-        }
-    }
-    catch( e )
-    {
-        print( e );
-    }
-}
diff --git a/deploy/installer/cleanup/package.xml b/deploy/installer/cleanup/package.xml
deleted file mode 100644
index f43e5b78..00000000
--- a/deploy/installer/cleanup/package.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Package>
-    <DisplayName>Cleanup AppData and Registry</DisplayName>
-    <Description>Cleans up AppData and Registry when selected (logs you out) - Broken</Description>
-    <Version>__VERSION__</Version>
-    <ReleaseDate>__DATE__</ReleaseDate>
-    <SortingPriority>80</SortingPriority>
-    <Script>installscript.qs</Script>
-    <Checkable>false</Checkable>
-</Package>