diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index 34ed844..bec2add 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -492,14 +492,6 @@
             return;
         }
 
-        if (isGroupDeleteAction(action)) {
-            popSecondLevel();
-            mMembersFragment.toastForSaveAction(action);
-            mCurrentView = ContactsView.ALL_CONTACTS;
-            showFabWithAnimation(/* showFab */ true);
-            return;
-        }
-
         if (isGroupSaveAction(action)) {
             mGroupUri = intent.getData();
             if (mGroupUri == null) {
@@ -541,10 +533,6 @@
         invalidateOptionsMenuIfNeeded();
     }
 
-    private static boolean isGroupDeleteAction(String action) {
-        return GroupUtil.ACTION_DELETE_GROUP.equals(action);
-    }
-
     private static boolean isGroupSaveAction(String action) {
         return GroupUtil.ACTION_UPDATE_GROUP.equals(action)
                 || GroupUtil.ACTION_ADD_TO_GROUP.equals(action)
