diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index c76a6a5..0c37e3c 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -17,15 +17,6 @@
 -->
 
 <resources>
-    <!-- Orientation of a widget. -->
-    <attr name="direction">
-        <!-- Vertical widget. -->
-        <enum name="vertical" value="0" />
-        <!-- Horizontal widget. -->
-        <enum name="horizontal" value="1" />
-    </attr>
-
-    <skip />
 
     <!-- DrawableStateProxyView specific attributes. These attributes are used to customize
          a DrawableStateProxyView view in XML files. -->
@@ -132,13 +123,6 @@
         <attr name="clingFocusedY" format="integer" />
     </declare-styleable>
 
-    <!-- HandleView specific attributes. These attributes are used to customize
-         a HandleView view in XML files. -->
-    <declare-styleable name="HandleView">
-        <!-- Orientation of the handle. -->
-        <attr name="direction" />
-    </declare-styleable>
-
     <!-- XML attributes used by default_workspace.xml -->
     <declare-styleable name="Favorite">
         <attr name="className" format="string" />
diff --git a/src/com/android/launcher3/HandleView.java b/src/com/android/launcher3/HandleView.java
deleted file mode 100644
index 6cb51da..0000000
--- a/src/com/android/launcher3/HandleView.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package com.android.launcher3;
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.view.View;
-import android.widget.ImageView;
-
-import com.android.launcher3.R;
-
-public class HandleView extends ImageView {
-    private static final int ORIENTATION_HORIZONTAL = 1;
-
-    private Launcher mLauncher;
-    private int mOrientation = ORIENTATION_HORIZONTAL;
-
-    public HandleView(Context context) {
-        super(context);
-    }
-
-    public HandleView(Context context, AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public HandleView(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-
-        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.HandleView, defStyle, 0);
-        mOrientation = a.getInt(R.styleable.HandleView_direction, ORIENTATION_HORIZONTAL);
-        a.recycle();
-
-        setContentDescription(context.getString(R.string.all_apps_button_label));
-    }
-
-    @Override
-    public View focusSearch(int direction) {
-        View newFocus = super.focusSearch(direction);
-        if (newFocus == null && !mLauncher.isAllAppsVisible()) {
-            final Workspace workspace = mLauncher.getWorkspace();
-            workspace.dispatchUnhandledMove(null, direction);
-            return (mOrientation == ORIENTATION_HORIZONTAL && direction == FOCUS_DOWN) ?
-                    this : workspace;
-        }
-        return newFocus;
-    }
-
-    @Override
-    public boolean onTouchEvent(MotionEvent ev) {
-        if (ev.getAction() == MotionEvent.ACTION_DOWN && mLauncher.isAllAppsVisible()) {
-            return false;
-        }
-        return super.onTouchEvent(ev);
-    }
-
-    void setLauncher(Launcher launcher) {
-        mLauncher = launcher;
-    }
-}
