diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index c0b07b4c68e..752a39e810b 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -143,21 +143,9 @@
             android:title="@string/color_temperature"
             android:summary="@string/color_temperature_desc" />
 
-        <!--<SwitchPreferenceCompat
-            android:key="ota_disable_automatic_update"
-            android:title="@string/ota_disable_automatic_update"
-            android:summary="@string/ota_disable_automatic_update_summary" />-->
-
         <Preference android:key="dsu_loader"
                     android:title="@string/dsu_loader_title" />
 
-        <Preference
-            android:key="demo_mode"
-            android:title="@string/demo_mode">
-            <intent android:action="com.android.settings.action.DEMO_MODE"
-                    android:targetPackage="com.android.systemui"/>
-        </Preference>
-
         <Preference
             android:key="quick_settings_tiles"
             android:title="@string/quick_settings_developer_tiles"
diff --git a/src/com/android/settings/development/AutomaticSystemServerHeapDumpPreferenceController.java b/src/com/android/settings/development/AutomaticSystemServerHeapDumpPreferenceController.java
index fbd661b653a..e8df9675861 100644
--- a/src/com/android/settings/development/AutomaticSystemServerHeapDumpPreferenceController.java
+++ b/src/com/android/settings/development/AutomaticSystemServerHeapDumpPreferenceController.java
@@ -49,8 +49,7 @@ public class AutomaticSystemServerHeapDumpPreferenceController extends
 
     @Override
     public boolean isAvailable() {
-        return Build.IS_DEBUGGABLE && mIsConfigEnabled
-                && !mUserManager.hasUserRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES);
+        return false;
     }
 
     @Override
diff --git a/src/com/android/settings/development/BugReportHandlerPreferenceController.java b/src/com/android/settings/development/BugReportHandlerPreferenceController.java
index f1545371fa1..6d7bcc736bc 100644
--- a/src/com/android/settings/development/BugReportHandlerPreferenceController.java
+++ b/src/com/android/settings/development/BugReportHandlerPreferenceController.java
@@ -49,8 +49,7 @@ public class BugReportHandlerPreferenceController extends DeveloperOptionsPrefer
 
     @Override
     public boolean isAvailable() {
-        return !mUserManager.hasUserRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES)
-                && mBugReportHandlerUtil.isBugReportHandlerEnabled(mContext);
+        return false;
     }
 
     @Override
diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index 80760545560..cba6f0cff46 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@ -815,7 +815,6 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
         controllers.add(new ShortcutManagerThrottlingPreferenceController(context));
         controllers.add(new EnableGnssRawMeasFullTrackingPreferenceController(context));
         controllers.add(new DefaultLaunchPreferenceController(context, "running_apps"));
-        controllers.add(new DefaultLaunchPreferenceController(context, "demo_mode"));
         controllers.add(new DefaultLaunchPreferenceController(context, "quick_settings_tiles"));
         controllers.add(new DefaultLaunchPreferenceController(context, "feature_flags_dashboard"));
         controllers.add(new DefaultUsbConfigurationPreferenceController(context));
diff --git a/src/com/android/settings/development/SystemServerHeapDumpPreferenceController.java b/src/com/android/settings/development/SystemServerHeapDumpPreferenceController.java
index e6701ce248c..2fa6fff8b18 100644
--- a/src/com/android/settings/development/SystemServerHeapDumpPreferenceController.java
+++ b/src/com/android/settings/development/SystemServerHeapDumpPreferenceController.java
@@ -53,8 +53,7 @@ public class SystemServerHeapDumpPreferenceController extends DeveloperOptionsPr
 
     @Override
     public boolean isAvailable() {
-        return Build.IS_DEBUGGABLE
-                && !mUserManager.hasUserRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES);
+        return false;
     }
 
     @Override