diff --git a/automatic/emulationstation.install/emulationstation.install.nuspec b/automatic/emulationstation.install/emulationstation.install.nuspec
deleted file mode 100644
index 4c96aec07..000000000
--- a/automatic/emulationstation.install/emulationstation.install.nuspec
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
-  <metadata>
-    <id>emulationstation.install</id>
-    <version>2.0.1.01</version>
-    <title>EmulationStation (Install)</title>
-    <authors>Alec Lofquist</authors>
-    <owners>dtgm</owners>
-<packageSourceUrl></packageSourceUrl>
-    <licenseUrl>https://github.com/Aloshi/EmulationStation/blob/master/LICENSE.md</licenseUrl>
-    <projectUrl>http://emulationstation.org/</projectUrl>
-    <iconUrl>https://cdn.rawgit.com/dtgm/chocolatey-packages/8d5c35302c809d5371e2747e0f4cc67df4d60a43/icons/emulationstation.png</iconUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>A graphical and themeable emulator front-end that allows you to access all your favorite games in one place, even without a keyboard.
-
-[FAQ](http://emulationstation.org/faq.html)
-[Forum](http://emulationstation.org/forum/index.php)
-[Source code](https://github.com/Aloshi/EmulationStation)</description>
-    <summary>Cross-platform graphical front-end for emulators with controller navigation</summary>
-    <releaseNotes>[Changelog](http://emulationstation.org/news/)</releaseNotes>
-    <copyright>© Alec Lofquist</copyright>
-    <tags>emulator gaming theming metadata</tags>
-    <dependencies>
-      <dependency id="autohotkey.portable" />
-    </dependencies>
-  </metadata>
-  <files>
-    <file src="tools\**" target="tools" />
-  </files>
-</package>
diff --git a/automatic/emulationstation.install/tools/tools/chocolateyInstall.ps1 b/automatic/emulationstation.install/tools/tools/chocolateyInstall.ps1
deleted file mode 100644
index 16af8d5e3..000000000
--- a/automatic/emulationstation.install/tools/tools/chocolateyInstall.ps1
+++ /dev/null
@@ -1,15 +0,0 @@
-$packageName = 'emulationstation.install'
-$installerType = 'exe'
-$silentArgs = '/S'
-$url = 'http://emulationstation.org/downloads/releases/2.0.1a/emulationstation_2.0.1a_win32.exe'
-$checksum = '1a139e936ea471141ab0d2b2dbe504ba788189c3'
-$checksumType = 'sha1'
-$validExitCodes = @(0)
-
-Install-ChocolateyPackage -PackageName "$packageName" `
-                          -FileType "$installerType" `
-                          -SilentArgs "$silentArgs" `
-                          -Url "$url" `
-                          -ValidExitCodes $validExitCodes `
-                          -Checksum "$checksum" `
-                          -ChecksumType "$checksumType"
\ No newline at end of file
diff --git a/automatic/emulationstation.install/tools/tools/chocolateyUninstall.ps1 b/automatic/emulationstation.install/tools/tools/chocolateyUninstall.ps1
deleted file mode 100644
index 5917efd59..000000000
--- a/automatic/emulationstation.install/tools/tools/chocolateyUninstall.ps1
+++ /dev/null
@@ -1,26 +0,0 @@
-$packageName = 'emulationstation.install'
-$packageSearch = 'EmulationStation'
-$fileType = 'exe'
-$silentArgs = '/S'
-$validExitCodes = @(0)
-$scriptPath = $(Split-Path -parent $MyInvocation.MyCommand.Definition)
-$ahkFile = Join-Path $scriptPath "uninstall.ahk"
-$ahkExe = 'AutoHotKey'
-$ahkRun = "$Env:Temp\$(Get-Random).ahk"
-Copy-Item $ahkFile "$ahkRun" -Force
-try {
-  Start-Process $ahkExe $ahkRun
-  Get-ItemProperty -Path @( 'HKLM:\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\*',
-                            'HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\*',
-                            'HKCU:\Software\Microsoft\Windows\CurrentVersion\Uninstall\*' ) `
-                   -ErrorAction:SilentlyContinue `
-  | Where-Object   { $_.DisplayName -like "$packageSearch*" } `
-  | ForEach-Object { Uninstall-ChocolateyPackage -PackageName "$packageName" `
-                                                 -FileType "$fileType" `
-                                                 -SilentArgs "$($silentArgs)" `
-                                                 -File "$($_.UninstallString)" `
-                                                 -ValidExitCodes $validExitCodes }
-  Remove-Item "$ahkRun" -Force
-} catch {
-  throw $_.Exception
-}
\ No newline at end of file
diff --git a/automatic/emulationstation.install/tools/tools/uninstall.ahk b/automatic/emulationstation.install/tools/tools/uninstall.ahk
deleted file mode 100644
index c7cbe10ed..000000000
--- a/automatic/emulationstation.install/tools/tools/uninstall.ahk
+++ /dev/null
@@ -1,6 +0,0 @@
-#NoEnv
-SetTitleMatchMode, 1  ;begins
-WinWait, EmulationStation Uninstall ahk_class #32770, Do you want to, 120
-WinActivate
-ControlClick, Button1, ahk_class #32770, &Yes,
-ExitApp
\ No newline at end of file
diff --git a/tools/Check/exclude.txt b/tools/Check/exclude.txt
index 32758ec67..44224dbc6 100644
--- a/tools/Check/exclude.txt
+++ b/tools/Check/exclude.txt
@@ -95,3 +95,4 @@ lili
 hte
 zona
 emulationstation
+emulationstation.install