diff --git a/src/com/android/launcher3/InfoDropTarget.java b/src/com/android/launcher3/InfoDropTarget.java
index 0ede2fc..d93cdcc 100644
--- a/src/com/android/launcher3/InfoDropTarget.java
+++ b/src/com/android/launcher3/InfoDropTarget.java
@@ -16,11 +16,8 @@
 
 package com.android.launcher3;
 
-import android.annotation.TargetApi;
 import android.content.ComponentName;
 import android.content.Context;
-import android.os.Build;
-import android.provider.Settings;
 import android.util.AttributeSet;
 
 import com.android.launcher3.compat.UserHandleCompat;
@@ -70,18 +67,8 @@
         return source.supportsAppInfoDropTarget() && supportsDrop(getContext(), info);
     }
 
-    @SuppressWarnings("deprecation")
-    @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
     public static boolean supportsDrop(Context context, Object info) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-            return (Settings.Global.getInt(context.getContentResolver(),
-                    Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0) == 1) &&
-                    (info instanceof AppInfo || info instanceof PendingAddItemInfo);
-        } else {
-            return (Settings.Secure.getInt(context.getContentResolver(),
-                    Settings.Secure.DEVELOPMENT_SETTINGS_ENABLED, 0) == 1) &&
-                    (info instanceof AppInfo || info instanceof PendingAddItemInfo);
-        }
+        return info instanceof AppInfo || info instanceof PendingAddItemInfo;
     }
 
     @Override
