diff --git a/Deploy/Cleanup.bat b/Deploy/Cleanup.bat
new file mode 100644
index 0000000000..27cf093eaf
--- /dev/null
+++ b/Deploy/Cleanup.bat
@@ -0,0 +1,20 @@
+cd /d %~dp0
+
+REM Clean Plugins
+cd ..\Output\Release\Plugins
+del NLog.dll /s
+del NLog.config /s
+del Wox.Plugin.pdb /s
+del Wox.Plugin.dll /s
+del Wox.Core.dll /s
+del Wox.Core.pdb /s
+del ICSharpCode.SharpZipLib.dll /s
+del NAppUpdate.Framework.dll /s
+del Wox.Infrastructure.dll /s
+del Wox.Infrastructure.pdb /s
+del Newtonsoft.Json.dll /s
+del WindowsInput.dll /s
+
+REM Clean Wox
+cd ..
+del *.xml
diff --git a/Plugins/Wox.Plugin.CMD/Wox.Plugin.CMD.csproj b/Plugins/Wox.Plugin.CMD/Wox.Plugin.CMD.csproj
index 81bea53e1f..b64f79fc27 100644
--- a/Plugins/Wox.Plugin.CMD/Wox.Plugin.CMD.csproj
+++ b/Plugins/Wox.Plugin.CMD/Wox.Plugin.CMD.csproj
@@ -50,9 +50,8 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
     <Reference Include="WindowsBase" />
-    <Reference Include="WindowsInput, Version=0.2.0.0, Culture=neutral, PublicKeyToken=9b287f7dc5073cad, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\WindowsInput.0.2.0.0\lib\net20\WindowsInput.dll</HintPath>
+    <Reference Include="WindowsInput">
+      <HintPath>..\..\packages\InputSimulator.1.0.4.0\lib\net20\WindowsInput.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/Plugins/Wox.Plugin.CMD/packages.config b/Plugins/Wox.Plugin.CMD/packages.config
index 5e64150e77..4687456d1a 100644
--- a/Plugins/Wox.Plugin.CMD/packages.config
+++ b/Plugins/Wox.Plugin.CMD/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="InputSimulator" version="1.0.4.0" targetFramework="net35" />
   <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net35" />
-  <package id="WindowsInput" version="0.2.0.0" targetFramework="net35" />
 </packages>
\ No newline at end of file
diff --git a/Plugins/Wox.Plugin.Caculator/Wox.Plugin.Caculator.csproj b/Plugins/Wox.Plugin.Caculator/Wox.Plugin.Caculator.csproj
index 88dd34d162..0a3f8ef910 100644
--- a/Plugins/Wox.Plugin.Caculator/Wox.Plugin.Caculator.csproj
+++ b/Plugins/Wox.Plugin.Caculator/Wox.Plugin.Caculator.csproj
@@ -81,6 +81,10 @@
     </PropertyGroup>
     <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
   </Target>
+  <PropertyGroup>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/Plugins/Wox.Plugin.QueryHistory/Wox.Plugin.QueryHistory.csproj b/Plugins/Wox.Plugin.QueryHistory/Wox.Plugin.QueryHistory.csproj
index 9ae22def69..2a1c20e7e1 100644
--- a/Plugins/Wox.Plugin.QueryHistory/Wox.Plugin.QueryHistory.csproj
+++ b/Plugins/Wox.Plugin.QueryHistory/Wox.Plugin.QueryHistory.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\Output\Release\Plugins\Wox.Plugin.Program\</OutputPath>
+    <OutputPath>..\..\Output\Release\Plugins\Wox.Plugin.QueryHistory\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
diff --git a/Wox/Wox.csproj b/Wox/Wox.csproj
index a71e300ffc..5bfe619990 100644
--- a/Wox/Wox.csproj
+++ b/Wox/Wox.csproj
@@ -103,7 +103,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\InputSimulator.1.0.4.0\lib\net20\WindowsInput.dll</HintPath>
     </Reference>
-    <Reference Include="WPFToolkit, Version=3.5.40128.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Converters\ConvertorBase.cs" />
@@ -297,17 +296,6 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Resource>
   </ItemGroup>
-  <ItemGroup>
-    <COMReference Include="Shell32">
-      <Guid>{50A7E9B0-70EF-11D1-B75A-00A0C90564FE}</Guid>
-      <VersionMajor>1</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>tlbimp</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
-  </ItemGroup>
   <ItemGroup>
     <Resource Include="Images\file.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/appveyor.yml b/appveyor.yml
index 429a0011e1..49f53ee273 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -15,6 +15,7 @@ build:
 after_test:
     - ps: .\deploy\nuget\pack.ps1
     - cmd: .\deploy\UpdateGenerator\build.bat
+    - cmd: .\deploy\Cleanup.bat
 
 deploy:
     provider: NuGet