diff --git a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
index c5d74c7..9e2de33 100644
--- a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
+++ b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
@@ -20,10 +20,8 @@
 import android.graphics.Rect;
 import android.util.AttributeSet;
 import android.view.View;
-import android.view.accessibility.AccessibilityNodeInfo;
 
 import com.android.launcher3.DeviceProfile;
-import com.android.launcher3.R;
 import com.android.quickstep.RecentsActivity;
 import com.android.quickstep.util.LayoutUtils;
 import com.android.quickstep.views.RecentsView;
@@ -73,21 +71,4 @@
         // Just use the activity task size for multi-window as well.
         return false;
     }
-
-    @Override
-    public void addTaskAccessibilityActionsExtra(AccessibilityNodeInfo info) {
-        info.addAction(
-                new AccessibilityNodeInfo.AccessibilityAction(
-                        R.string.recents_clear_all,
-                        getContext().getText(R.string.recents_clear_all)));
-    }
-
-    @Override
-    public boolean performTaskAccessibilityActionExtra(int action) {
-        if (action == R.string.recents_clear_all) {
-            dismissAllTasks();
-            return true;
-        }
-        return false;
-    }
 }
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 4c2795b..d550edc 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1367,9 +1367,6 @@
         return true;
     }
 
-    public void addTaskAccessibilityActionsExtra(AccessibilityNodeInfo info) {
-    }
-
     public boolean performTaskAccessibilityActionExtra(int action) {
         return false;
     }
diff --git a/quickstep/src/com/android/quickstep/views/ShelfScrimView.java b/quickstep/src/com/android/quickstep/views/ShelfScrimView.java
index aca8351..1ea112d 100644
--- a/quickstep/src/com/android/quickstep/views/ShelfScrimView.java
+++ b/quickstep/src/com/android/quickstep/views/ShelfScrimView.java
@@ -28,9 +28,6 @@
 import android.graphics.Path;
 import android.graphics.Path.Direction;
 import android.graphics.Path.Op;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
 import android.util.AttributeSet;
 
 import com.android.launcher3.DeviceProfile;
@@ -51,7 +48,6 @@
     private static final int THRESHOLD_ALPHA_DARK = 102;
     private static final int THRESHOLD_ALPHA_LIGHT = 46;
     private static final int THRESHOLD_ALPHA_SUPER_LIGHT = 128;
-    private static final int CLEAR_ALL_TASKS = R.string.recents_clear_all;
 
     // In transposed layout, we simply draw a flat color.
     private boolean mDrawingFlatColor;
@@ -208,43 +204,4 @@
                 mRadius, mRadius, mPaint);
         return minTop - mDragHandleSize - top;
     }
-
-    @NonNull
-    @Override
-    protected AccessibilityHelper createAccessibilityHelper() {
-        return new ShelfScrimAccessibilityHelper();
-    }
-
-    protected class ShelfScrimAccessibilityHelper extends AccessibilityHelper {
-        @Override
-        protected void onPopulateNodeForVirtualView(int virtualViewId,
-                AccessibilityNodeInfoCompat node) {
-            super.onPopulateNodeForVirtualView(virtualViewId, node);
-
-            if (mLauncher.isInState(OVERVIEW)) {
-                final RecentsView overviewPanel = mLauncher.getOverviewPanel();
-                if (overviewPanel.getChildCount() != 0) {
-                    node.addAction(
-                            new AccessibilityNodeInfoCompat.AccessibilityActionCompat(
-                                    CLEAR_ALL_TASKS,
-                                    getContext().getText(CLEAR_ALL_TASKS)));
-                }
-            }
-        }
-
-        @Override
-        protected boolean onPerformActionForVirtualView(
-                int virtualViewId, int action, Bundle arguments) {
-            if (super.onPerformActionForVirtualView(virtualViewId, action, arguments)) return true;
-
-            if (action == CLEAR_ALL_TASKS) {
-                if (mLauncher.isInState(OVERVIEW)) {
-                    mLauncher.<RecentsView>getOverviewPanel().dismissAllTasks();
-                }
-                return true;
-            }
-
-            return false;
-        }
-    }
 }
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 91c0fa5..b5f31b8 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -321,8 +321,6 @@
         }
 
         final RecentsView recentsView = getRecentsView();
-        recentsView.addTaskAccessibilityActionsExtra(info);
-
         final AccessibilityNodeInfo.CollectionItemInfo itemInfo =
                 AccessibilityNodeInfo.CollectionItemInfo.obtain(
                         0, 1, recentsView.getChildCount() - recentsView.indexOfChild(this) - 1, 1,
