diff --git a/MacPass/MPAttachmentTableDataSource.m b/MacPass/MPAttachmentTableDataSource.m
index c1d40a7e..49e86964 100644
--- a/MacPass/MPAttachmentTableDataSource.m
+++ b/MacPass/MPAttachmentTableDataSource.m
@@ -34,7 +34,6 @@
   if(numberOfDirectories == [arrayOfURLs count]) {
     return NSDragOperationNone;
   }
-  row = [tableView numberOfRows];
   return NSDragOperationCopy;
 }
 
diff --git a/MacPass/MPOutlineViewController.m b/MacPass/MPOutlineViewController.m
index 0f5e4bad..1f061a64 100644
--- a/MacPass/MPOutlineViewController.m
+++ b/MacPass/MPOutlineViewController.m
@@ -132,7 +132,7 @@ NSString *const _MPOutlinveViewHeaderViewIdentifier = @"HeaderCell";
 
 #pragma mark Notifications
 - (void)setupNotifications:(MPDocumentWindowController *)windowController {
-  [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_didCreateGroup:) name:MPDocumentDidAddGroupNotification object:[windowController document]];
+  // Nothing to do anymore
 }
 
 - (void)clearSelection {
@@ -140,20 +140,6 @@ NSString *const _MPOutlinveViewHeaderViewIdentifier = @"HeaderCell";
   [self outlineViewSelectionDidChange:nil];
 }
 
-- (void)_didCreateGroup:(NSNotification *)notification {
-  NSInteger selectedRow = [_outlineView selectedRow];
-  NSIndexSet *indexSet;
-  if( selectedRow == -1) {
-    MPDocument *document = [[self windowController] document];
-    indexSet = [NSIndexSet indexSetWithIndex:[document.root.groups count]];
-  }
-  else {
-    id item = [_outlineView itemAtRow:selectedRow];
-    [_outlineView expandItem:item];
-    indexSet = [NSIndexSet indexSetWithIndex:selectedRow + 1];
-  }
-}
-
 - (void)_didBecomeFirstResponder:(NSNotification *)notification {
   if( [notification object] != _outlineView ) {
     return; // Nothing we need to worry about