diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index b6a75f4155..1ec26065f3 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+#### 2.58.15 - 12.04.2016
+* BUGFIX: Remove process should remove packages from specified groups - https://github.com/fsprojects/Paket/issues/1596
+
 #### 2.58.14 - 11.04.2016
 * BUGFIX: Compare full filename for pack with template file - https://github.com/fsprojects/Paket/issues/1594
 
diff --git a/src/Paket.Core/ProjectFile.fs b/src/Paket.Core/ProjectFile.fs
index cd3b007e76..d907309ef1 100644
--- a/src/Paket.Core/ProjectFile.fs
+++ b/src/Paket.Core/ProjectFile.fs
@@ -501,8 +501,11 @@ module ProjectFile =
         | None -> false
         | Some fileName -> 
             let referencesFile = ReferencesFile.FromFile fileName
-            referencesFile.Groups.[groupName].NugetPackages 
-            |> Seq.exists (fun p -> p.Name = package)
+            match referencesFile.Groups |> Map.tryFind groupName with
+            | None -> false
+            | Some group ->
+                group.NugetPackages 
+                |> Seq.exists (fun p -> p.Name = package)
 
     let deleteIfEmpty name (project:ProjectFile) =
         let nodesToDelete = List<_>()
diff --git a/src/Paket/Paket.fsproj b/src/Paket/Paket.fsproj
index 1744a32fff..0e8bc93300 100644
--- a/src/Paket/Paket.fsproj
+++ b/src/Paket/Paket.fsproj
@@ -41,8 +41,8 @@
     <WarningLevel>3</WarningLevel>
     <DocumentationFile>
     </DocumentationFile>
-    <StartArguments>pack output out version 1.0.0 templatefile paket.template</StartArguments>
-    <StartWorkingDirectory>D:\code\Paket\integrationtests\scenarios\i001594-pack\temp</StartWorkingDirectory>
+    <StartArguments>remove nuget NuGet.CommandLine group Build</StartArguments>
+    <StartWorkingDirectory>D:\code\suave</StartWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup>
     <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>