diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiConstants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiConstants.java
index 01e5d5ccf..d0a7f15d2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiConstants.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiConstants.java
@@ -67,7 +67,6 @@ public final class HuaweiConstants {
     public static final String PREF_HUAWEI_WORKMODE = "workmode";
     public static final String PREF_HUAWEI_TRUSLEEP = "trusleep";
     public static final String PREF_HUAWEI_DND_LIFT_WRIST_TYPE = "dnd_lift_wrist_type"; // SharedPref for 0x01 0x1D
-    public static final String PREF_HUAWEI_DEBUG = "debug_huawei";
     public static final String PREF_HUAWEI_DEBUG_REQUEST = "debug_huawei_request";
 
     public static final String PKG_NAME = "com.huawei.devicegroupmanage";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSettingsCustomizer.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSettingsCustomizer.java
index 898eecf24..c7835cb93 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSettingsCustomizer.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSettingsCustomizer.java
@@ -37,7 +37,6 @@ import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 import nodomain.freeyourgadget.gadgetbridge.util.XTimePreference;
 
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.*;
-import static nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants.PREF_HUAWEI_DEBUG;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants.PREF_HUAWEI_DEBUG_REQUEST;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants.PREF_HUAWEI_TRUSLEEP;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants.PREF_HUAWEI_WORKMODE;
@@ -111,7 +110,6 @@ public class HuaweiSettingsCustomizer implements DeviceSpecificSettingsCustomize
 
         handler.addPreferenceHandlerFor(PREF_HUAWEI_WORKMODE);
         handler.addPreferenceHandlerFor(PREF_HUAWEI_TRUSLEEP);
-        handler.addPreferenceHandlerFor(PREF_HUAWEI_DEBUG);
         handler.addPreferenceHandlerFor(PREF_HUAWEI_DEBUG_REQUEST);
 
         // Only supported on specific devices
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/DebugRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/DebugRequest.java
index df3d58d30..6a3e7e780 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/DebugRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/DebugRequest.java
@@ -38,7 +38,7 @@ public class DebugRequest extends Request {
     protected List<byte[]> createRequest() throws RequestCreationException {
         String debugString = GBApplication
             .getDeviceSpecificSharedPrefs(supportProvider.getDevice().getAddress())
-            .getString(HuaweiConstants.PREF_HUAWEI_DEBUG, "1,1,false,(1,/),(2,/),(3,/),(4,/)");
+            .getString(HuaweiConstants.PREF_HUAWEI_DEBUG_REQUEST, "1,1,false,(1,/),(2,/),(3,/),(4,/)");
         HuaweiPacket packet = parseDebugString(debugString);
         try {
             return packet.serialize();
diff --git a/app/src/main/res/xml/devicesettings_huawei_debug.xml b/app/src/main/res/xml/devicesettings_huawei_debug.xml
deleted file mode 100644
index b02d20acc..000000000
--- a/app/src/main/res/xml/devicesettings_huawei_debug.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <EditTextPreference
-        android:icon="@drawable/ic_warning"
-        android:key="debug_huawei"
-        android:maxLength="16"
-        android:summary="@string/pref_summary_debug"
-        android:title="@string/pref_title_debug" />
-
-</androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/devicesettings_huawei_reparse_workout_data.xml b/app/src/main/res/xml/devicesettings_huawei_reparse_workout_data.xml
deleted file mode 100644
index 9e1226c25..000000000
--- a/app/src/main/res/xml/devicesettings_huawei_reparse_workout_data.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <SwitchPreferenceCompat
-        android:defaultValue="false"
-        android:key="huawei_reparse_workout_data"
-        android:title="@string/huawei_reparse_workout_data"
-        android:summary="@string/huawei_reparse_workout_data_description" />
-
-</PreferenceScreen>
\ No newline at end of file