diff --git a/NzbDrone/NzbDrone.csproj b/NzbDrone/NzbDrone.csproj
index 15e70a225..df782eb25 100644
--- a/NzbDrone/NzbDrone.csproj
+++ b/NzbDrone/NzbDrone.csproj
@@ -43,7 +43,6 @@
     <WarningLevel>4</WarningLevel>
     <UseVSHostingProcess>true</UseVSHostingProcess>
     <CodeAnalysisRuleSet>BasicCorrectnessRules.ruleset</CodeAnalysisRuleSet>
-    <IntermediateOutputPath>C:\Users\Mark\AppData\Local\Temp\vs167E.tmp\x86\Debug\</IntermediateOutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -53,7 +52,6 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <IntermediateOutputPath>C:\Users\Mark\AppData\Local\Temp\vs167E.tmp\x86\Release\</IntermediateOutputPath>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>NzbDrone.ico</ApplicationIcon>
diff --git a/build.ps1 b/build.ps1
index 749ee6dcf..a770a0a94 100644
--- a/build.ps1
+++ b/build.ps1
@@ -34,8 +34,9 @@ Function CleanFolder($path)
     get-childitem $path -File -Filter app.config | foreach ($_) {remove-item $_.fullname}
   
     Write-Host Removing Empty folders
-    while (Get-ChildItem $path -recurse | where {!@(Get-ChildItem -force $_.fullname)} | Test-Path) {
-        Get-ChildItem $path -recurse | where {!@(Get-ChildItem -force $_.fullname)} | Remove-Item
+    while (Get-ChildItem $path -recurse | where {!@(Get-ChildItem -force $_.fullname)} | Test-Path) 
+    {
+        Get-ChildItem $path -Directory -recurse | where {!@(Get-ChildItem -force $_.fullname)} | Remove-Item
     }
 }
 
@@ -73,13 +74,17 @@ Function Nunit()
      Invoke-Expression  $nunitExe 
 }
 
-Function Grunt()
+Function RunGrunt()
 {
-   grunt package
+   $npmInstall = 'npm install'
+   $gruntPackage = 'grunt package'
+
+   Invoke-Expression $npmInstall
+   Invoke-Expression $gruntPackage
 }
 
 Build
-Grunt
+RunGrunt
 PackageTests
 
 if($runTests)