diff --git a/src/com/android/launcher2/AllAppsPagedView.java b/src/com/android/launcher2/AllAppsPagedView.java
index c9a3119..dccc03d 100644
--- a/src/com/android/launcher2/AllAppsPagedView.java
+++ b/src/com/android/launcher2/AllAppsPagedView.java
@@ -45,7 +45,6 @@
     View.OnClickListener, DragSource, DropTarget {
 
     private static final String TAG = "AllAppsPagedView";
-    private static final boolean DEBUG = false;
 
     private Launcher mLauncher;
     private DragController mDragController;
diff --git a/src/com/android/launcher2/CustomizePagedView.java b/src/com/android/launcher2/CustomizePagedView.java
index 429c7fd..cfc15d1 100644
--- a/src/com/android/launcher2/CustomizePagedView.java
+++ b/src/com/android/launcher2/CustomizePagedView.java
@@ -76,7 +76,6 @@
     }
 
     private static final String TAG = "CustomizeWorkspace";
-    private static final boolean DEBUG = false;
 
     private Launcher mLauncher;
     private DragController mDragController;
diff --git a/src/com/android/launcher2/HolographicOutlineHelper.java b/src/com/android/launcher2/HolographicOutlineHelper.java
index bf4c05a..0311afa 100644
--- a/src/com/android/launcher2/HolographicOutlineHelper.java
+++ b/src/com/android/launcher2/HolographicOutlineHelper.java
@@ -55,7 +55,6 @@
         sMediumInnerBlurMaskFilter = new BlurMaskFilter(scale * 2.0f, BlurMaskFilter.Blur.NORMAL);
     }
 
-    private static final MaskFilter sFineClipTable = TableMaskFilter.CreateClipTable(0, 20);
     private static final MaskFilter sCoarseClipTable = TableMaskFilter.CreateClipTable(0, 200);
 
     private int[] mTempOffset = new int[2];
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 06893e2..40751e2 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -160,7 +160,7 @@
     private float[] mTempDragBottomRightCoordinates = new float[2];
     private Matrix mTempInverseMatrix = new Matrix();
 
-    private SpringLoadedDragController mSpringLoadedDragControllger;
+    private SpringLoadedDragController mSpringLoadedDragController;
 
     private static final int DEFAULT_CELL_COUNT_X = 4;
     private static final int DEFAULT_CELL_COUNT_Y = 4;
@@ -186,8 +186,6 @@
     /** If mInScrollArea is true, the direction of the scroll. */
     private int mPendingScrollDirection = DragController.SCROLL_NONE;
 
-    private boolean mInDragMode = false;
-
     private final HolographicOutlineHelper mOutlineHelper = new HolographicOutlineHelper();
     private Bitmap mDragOutline = null;
     private final Rect mTempRect = new Rect();
@@ -2019,12 +2017,12 @@
                 if (layout != mDragTargetLayout) {
                     if (mDragTargetLayout != null) {
                         mDragTargetLayout.setHover(false);
-                        mSpringLoadedDragControllger.onDragExit();
+                        mSpringLoadedDragController.onDragExit();
                     }
                     mDragTargetLayout = layout;
                     if (mDragTargetLayout != null && mDragTargetLayout.getAcceptsDrops()) {
                         mDragTargetLayout.setHover(true);
-                        mSpringLoadedDragControllger.onDragEnter(mDragTargetLayout);
+                        mSpringLoadedDragController.onDragEnter(mDragTargetLayout);
                     }
                 }
             } else {
@@ -2236,7 +2234,7 @@
 
     void setLauncher(Launcher launcher) {
         mLauncher = launcher;
-        mSpringLoadedDragControllger = new SpringLoadedDragController(mLauncher);
+        mSpringLoadedDragController = new SpringLoadedDragController(mLauncher);
 
         mCustomizationDrawer = mLauncher.findViewById(R.id.customization_drawer);
         mCustomizationDrawerContent =
@@ -2320,7 +2318,7 @@
         for (int i = 0; i < childCount; i++) {
             ((CellLayout) getChildAt(i)).setHover(false);
         }
-        mSpringLoadedDragControllger.onDragExit();
+        mSpringLoadedDragController.onDragExit();
     }
 
     @Override
