diff --git a/configs/surface-4.19.config b/configs/surface-4.19.config
deleted file mode 100644
index 4b65687a3..000000000
--- a/configs/surface-4.19.config
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Intel IPTS Touchscreen
-#
-CONFIG_INTEL_IPTS=m
-CONFIG_INTEL_IPTS_SURFACE=m
-
-#
-# Surface Aggregator Module
-#
-CONFIG_SURFACE_AGGREGATOR=m
-CONFIG_SURFACE_AGGREGATOR_ERROR_INJECTION=n
-CONFIG_SURFACE_AGGREGATOR_BUS=y
-CONFIG_SURFACE_AGGREGATOR_CDEV=m
-CONFIG_SURFACE_AGGREGATOR_REGISTRY=m
-
-CONFIG_SURFACE_ACPI_NOTIFY=m
-CONFIG_SURFACE_DTX=m
-CONFIG_SURFACE_PERFMODE=m
-
-CONFIG_SURFACE_HID=m
-CONFIG_SURFACE_KBD=m
-
-CONFIG_BATTERY_SURFACE=m
-CONFIG_CHARGER_SURFACE=m
-
-#
-# Surface Hotplug
-#
-CONFIG_SURFACE_HOTPLUG=m
-
-#
-# Other Drivers
-#
-CONFIG_INPUT_SOC_BUTTON_ARRAY=m
-CONFIG_SURFACE_3_BUTTON=m
-CONFIG_SURFACE_3_POWER_OPREGION=m
-CONFIG_SURFACE_PRO3_BUTTON=m
-CONFIG_SURFACE_GPE=m
-CONFIG_SURFACE_BOOK1_DGPU_SWITCH=m
diff --git a/configs/surface-5.10.config b/configs/surface-5.10.config
deleted file mode 100644
index f7a91e17c..000000000
--- a/configs/surface-5.10.config
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# Surface Aggregator Module
-#
-CONFIG_SURFACE_AGGREGATOR=m
-CONFIG_SURFACE_AGGREGATOR_ERROR_INJECTION=n
-CONFIG_SURFACE_AGGREGATOR_BUS=y
-CONFIG_SURFACE_AGGREGATOR_CDEV=m
-CONFIG_SURFACE_AGGREGATOR_REGISTRY=m
-
-CONFIG_SURFACE_ACPI_NOTIFY=m
-CONFIG_SURFACE_DTX=m
-CONFIG_SURFACE_PERFMODE=m
-
-CONFIG_SURFACE_HID=m
-CONFIG_SURFACE_KBD=m
-
-CONFIG_BATTERY_SURFACE=m
-CONFIG_CHARGER_SURFACE=m
-
-#
-# Surface Hotplug
-#
-CONFIG_SURFACE_HOTPLUG=m
-
-#
-# IPTS touchscreen
-#
-# This only enables the user interface for IPTS data.
-# For the touchscreen to work, you need to install iptsd.
-#
-CONFIG_MISC_IPTS=m
-
-#
-# Cameras: IPU3
-#
-CONFIG_VIDEO_IPU3_IMGU=m
-CONFIG_VIDEO_IPU3_CIO2=m
-CONFIG_CIO2_BRIDGE=y
-CONFIG_INTEL_SKL_INT3472=m
-
-#
-# Cameras: Sensor drivers
-#
-CONFIG_VIDEO_OV5693=m
-CONFIG_VIDEO_OV8865=m
-
-#
-# ALS Sensor for Surface Book 3, Surface Laptop 3, Surface Pro 7
-#
-CONFIG_APDS9960=m
-
-#
-# Other Drivers
-#
-CONFIG_INPUT_SOC_BUTTON_ARRAY=m
-CONFIG_SURFACE_3_BUTTON=m
-CONFIG_SURFACE_3_POWER_OPREGION=m
-CONFIG_SURFACE_PRO3_BUTTON=m
-CONFIG_SURFACE_GPE=m
-CONFIG_SURFACE_BOOK1_DGPU_SWITCH=m
diff --git a/configs/surface-5.11.config b/configs/surface-5.11.config
deleted file mode 100644
index f7a91e17c..000000000
--- a/configs/surface-5.11.config
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# Surface Aggregator Module
-#
-CONFIG_SURFACE_AGGREGATOR=m
-CONFIG_SURFACE_AGGREGATOR_ERROR_INJECTION=n
-CONFIG_SURFACE_AGGREGATOR_BUS=y
-CONFIG_SURFACE_AGGREGATOR_CDEV=m
-CONFIG_SURFACE_AGGREGATOR_REGISTRY=m
-
-CONFIG_SURFACE_ACPI_NOTIFY=m
-CONFIG_SURFACE_DTX=m
-CONFIG_SURFACE_PERFMODE=m
-
-CONFIG_SURFACE_HID=m
-CONFIG_SURFACE_KBD=m
-
-CONFIG_BATTERY_SURFACE=m
-CONFIG_CHARGER_SURFACE=m
-
-#
-# Surface Hotplug
-#
-CONFIG_SURFACE_HOTPLUG=m
-
-#
-# IPTS touchscreen
-#
-# This only enables the user interface for IPTS data.
-# For the touchscreen to work, you need to install iptsd.
-#
-CONFIG_MISC_IPTS=m
-
-#
-# Cameras: IPU3
-#
-CONFIG_VIDEO_IPU3_IMGU=m
-CONFIG_VIDEO_IPU3_CIO2=m
-CONFIG_CIO2_BRIDGE=y
-CONFIG_INTEL_SKL_INT3472=m
-
-#
-# Cameras: Sensor drivers
-#
-CONFIG_VIDEO_OV5693=m
-CONFIG_VIDEO_OV8865=m
-
-#
-# ALS Sensor for Surface Book 3, Surface Laptop 3, Surface Pro 7
-#
-CONFIG_APDS9960=m
-
-#
-# Other Drivers
-#
-CONFIG_INPUT_SOC_BUTTON_ARRAY=m
-CONFIG_SURFACE_3_BUTTON=m
-CONFIG_SURFACE_3_POWER_OPREGION=m
-CONFIG_SURFACE_PRO3_BUTTON=m
-CONFIG_SURFACE_GPE=m
-CONFIG_SURFACE_BOOK1_DGPU_SWITCH=m
diff --git a/configs/surface-5.12.config b/configs/surface-5.12.config
deleted file mode 100644
index cb2b3c9c4..000000000
--- a/configs/surface-5.12.config
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# Surface Aggregator Module
-#
-CONFIG_SURFACE_AGGREGATOR=m
-CONFIG_SURFACE_AGGREGATOR_ERROR_INJECTION=n
-CONFIG_SURFACE_AGGREGATOR_BUS=y
-CONFIG_SURFACE_AGGREGATOR_CDEV=m
-CONFIG_SURFACE_AGGREGATOR_REGISTRY=m
-
-CONFIG_SURFACE_ACPI_NOTIFY=m
-CONFIG_SURFACE_DTX=m
-CONFIG_SURFACE_PLATFORM_PROFILE=m
-
-CONFIG_SURFACE_HID=m
-CONFIG_SURFACE_KBD=m
-
-CONFIG_BATTERY_SURFACE=m
-CONFIG_CHARGER_SURFACE=m
-
-#
-# Surface Hotplug
-#
-CONFIG_SURFACE_HOTPLUG=m
-
-#
-# IPTS touchscreen
-#
-# This only enables the user interface for IPTS data.
-# For the touchscreen to work, you need to install iptsd.
-#
-CONFIG_MISC_IPTS=m
-
-#
-# Cameras: IPU3
-#
-CONFIG_VIDEO_IPU3_IMGU=m
-CONFIG_VIDEO_IPU3_CIO2=m
-CONFIG_CIO2_BRIDGE=y
-CONFIG_INTEL_SKL_INT3472=m
-
-#
-# Cameras: Sensor drivers
-#
-CONFIG_VIDEO_OV5693=m
-CONFIG_VIDEO_OV8865=m
-
-#
-# ALS Sensor for Surface Book 3, Surface Laptop 3, Surface Pro 7
-#
-CONFIG_APDS9960=m
-
-#
-# Other Drivers
-#
-CONFIG_INPUT_SOC_BUTTON_ARRAY=m
-CONFIG_SURFACE_3_BUTTON=m
-CONFIG_SURFACE_3_POWER_OPREGION=m
-CONFIG_SURFACE_PRO3_BUTTON=m
-CONFIG_SURFACE_GPE=m
-CONFIG_SURFACE_BOOK1_DGPU_SWITCH=m
diff --git a/configs/surface-5.13.config b/configs/surface-5.13.config
deleted file mode 100644
index cb2b3c9c4..000000000
--- a/configs/surface-5.13.config
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# Surface Aggregator Module
-#
-CONFIG_SURFACE_AGGREGATOR=m
-CONFIG_SURFACE_AGGREGATOR_ERROR_INJECTION=n
-CONFIG_SURFACE_AGGREGATOR_BUS=y
-CONFIG_SURFACE_AGGREGATOR_CDEV=m
-CONFIG_SURFACE_AGGREGATOR_REGISTRY=m
-
-CONFIG_SURFACE_ACPI_NOTIFY=m
-CONFIG_SURFACE_DTX=m
-CONFIG_SURFACE_PLATFORM_PROFILE=m
-
-CONFIG_SURFACE_HID=m
-CONFIG_SURFACE_KBD=m
-
-CONFIG_BATTERY_SURFACE=m
-CONFIG_CHARGER_SURFACE=m
-
-#
-# Surface Hotplug
-#
-CONFIG_SURFACE_HOTPLUG=m
-
-#
-# IPTS touchscreen
-#
-# This only enables the user interface for IPTS data.
-# For the touchscreen to work, you need to install iptsd.
-#
-CONFIG_MISC_IPTS=m
-
-#
-# Cameras: IPU3
-#
-CONFIG_VIDEO_IPU3_IMGU=m
-CONFIG_VIDEO_IPU3_CIO2=m
-CONFIG_CIO2_BRIDGE=y
-CONFIG_INTEL_SKL_INT3472=m
-
-#
-# Cameras: Sensor drivers
-#
-CONFIG_VIDEO_OV5693=m
-CONFIG_VIDEO_OV8865=m
-
-#
-# ALS Sensor for Surface Book 3, Surface Laptop 3, Surface Pro 7
-#
-CONFIG_APDS9960=m
-
-#
-# Other Drivers
-#
-CONFIG_INPUT_SOC_BUTTON_ARRAY=m
-CONFIG_SURFACE_3_BUTTON=m
-CONFIG_SURFACE_3_POWER_OPREGION=m
-CONFIG_SURFACE_PRO3_BUTTON=m
-CONFIG_SURFACE_GPE=m
-CONFIG_SURFACE_BOOK1_DGPU_SWITCH=m
diff --git a/configs/surface-5.14.config b/configs/surface-5.14.config
deleted file mode 100644
index cdf71cce4..000000000
--- a/configs/surface-5.14.config
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# Surface Aggregator Module
-#
-CONFIG_SURFACE_AGGREGATOR=m
-CONFIG_SURFACE_AGGREGATOR_ERROR_INJECTION=n
-CONFIG_SURFACE_AGGREGATOR_BUS=y
-CONFIG_SURFACE_AGGREGATOR_CDEV=m
-CONFIG_SURFACE_AGGREGATOR_REGISTRY=m
-
-CONFIG_SURFACE_ACPI_NOTIFY=m
-CONFIG_SURFACE_DTX=m
-CONFIG_SURFACE_KIP_TABLET_SWITCH=m
-CONFIG_SURFACE_PLATFORM_PROFILE=m
-
-CONFIG_SURFACE_HID=m
-CONFIG_SURFACE_KBD=m
-
-CONFIG_BATTERY_SURFACE=m
-CONFIG_CHARGER_SURFACE=m
-
-#
-# Surface Hotplug
-#
-CONFIG_SURFACE_HOTPLUG=m
-
-#
-# IPTS touchscreen
-#
-# This only enables the user interface for IPTS data.
-# For the touchscreen to work, you need to install iptsd.
-#
-CONFIG_MISC_IPTS=m
-
-#
-# Cameras: IPU3
-#
-CONFIG_VIDEO_IPU3_IMGU=m
-CONFIG_VIDEO_IPU3_CIO2=m
-CONFIG_CIO2_BRIDGE=y
-CONFIG_INTEL_SKL_INT3472=m
-CONFIG_REGULATOR_TPS68470=m
-CONFIG_COMMON_CLK_TPS68470=m
-
-#
-# Cameras: Sensor drivers
-#
-CONFIG_VIDEO_OV5693=m
-CONFIG_VIDEO_OV8865=m
-
-#
-# ALS Sensor for Surface Book 3, Surface Laptop 3, Surface Pro 7
-#
-CONFIG_APDS9960=m
-
-#
-# Other Drivers
-#
-CONFIG_INPUT_SOC_BUTTON_ARRAY=m
-CONFIG_SURFACE_3_BUTTON=m
-CONFIG_SURFACE_3_POWER_OPREGION=m
-CONFIG_SURFACE_PRO3_BUTTON=m
-CONFIG_SURFACE_GPE=m
-CONFIG_SURFACE_BOOK1_DGPU_SWITCH=m
diff --git a/configs/surface-5.15.config b/configs/surface-5.15.config
deleted file mode 100644
index cdf71cce4..000000000
--- a/configs/surface-5.15.config
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# Surface Aggregator Module
-#
-CONFIG_SURFACE_AGGREGATOR=m
-CONFIG_SURFACE_AGGREGATOR_ERROR_INJECTION=n
-CONFIG_SURFACE_AGGREGATOR_BUS=y
-CONFIG_SURFACE_AGGREGATOR_CDEV=m
-CONFIG_SURFACE_AGGREGATOR_REGISTRY=m
-
-CONFIG_SURFACE_ACPI_NOTIFY=m
-CONFIG_SURFACE_DTX=m
-CONFIG_SURFACE_KIP_TABLET_SWITCH=m
-CONFIG_SURFACE_PLATFORM_PROFILE=m
-
-CONFIG_SURFACE_HID=m
-CONFIG_SURFACE_KBD=m
-
-CONFIG_BATTERY_SURFACE=m
-CONFIG_CHARGER_SURFACE=m
-
-#
-# Surface Hotplug
-#
-CONFIG_SURFACE_HOTPLUG=m
-
-#
-# IPTS touchscreen
-#
-# This only enables the user interface for IPTS data.
-# For the touchscreen to work, you need to install iptsd.
-#
-CONFIG_MISC_IPTS=m
-
-#
-# Cameras: IPU3
-#
-CONFIG_VIDEO_IPU3_IMGU=m
-CONFIG_VIDEO_IPU3_CIO2=m
-CONFIG_CIO2_BRIDGE=y
-CONFIG_INTEL_SKL_INT3472=m
-CONFIG_REGULATOR_TPS68470=m
-CONFIG_COMMON_CLK_TPS68470=m
-
-#
-# Cameras: Sensor drivers
-#
-CONFIG_VIDEO_OV5693=m
-CONFIG_VIDEO_OV8865=m
-
-#
-# ALS Sensor for Surface Book 3, Surface Laptop 3, Surface Pro 7
-#
-CONFIG_APDS9960=m
-
-#
-# Other Drivers
-#
-CONFIG_INPUT_SOC_BUTTON_ARRAY=m
-CONFIG_SURFACE_3_BUTTON=m
-CONFIG_SURFACE_3_POWER_OPREGION=m
-CONFIG_SURFACE_PRO3_BUTTON=m
-CONFIG_SURFACE_GPE=m
-CONFIG_SURFACE_BOOK1_DGPU_SWITCH=m
diff --git a/configs/surface-5.16.config b/configs/surface-5.16.config
deleted file mode 100644
index cdf71cce4..000000000
--- a/configs/surface-5.16.config
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# Surface Aggregator Module
-#
-CONFIG_SURFACE_AGGREGATOR=m
-CONFIG_SURFACE_AGGREGATOR_ERROR_INJECTION=n
-CONFIG_SURFACE_AGGREGATOR_BUS=y
-CONFIG_SURFACE_AGGREGATOR_CDEV=m
-CONFIG_SURFACE_AGGREGATOR_REGISTRY=m
-
-CONFIG_SURFACE_ACPI_NOTIFY=m
-CONFIG_SURFACE_DTX=m
-CONFIG_SURFACE_KIP_TABLET_SWITCH=m
-CONFIG_SURFACE_PLATFORM_PROFILE=m
-
-CONFIG_SURFACE_HID=m
-CONFIG_SURFACE_KBD=m
-
-CONFIG_BATTERY_SURFACE=m
-CONFIG_CHARGER_SURFACE=m
-
-#
-# Surface Hotplug
-#
-CONFIG_SURFACE_HOTPLUG=m
-
-#
-# IPTS touchscreen
-#
-# This only enables the user interface for IPTS data.
-# For the touchscreen to work, you need to install iptsd.
-#
-CONFIG_MISC_IPTS=m
-
-#
-# Cameras: IPU3
-#
-CONFIG_VIDEO_IPU3_IMGU=m
-CONFIG_VIDEO_IPU3_CIO2=m
-CONFIG_CIO2_BRIDGE=y
-CONFIG_INTEL_SKL_INT3472=m
-CONFIG_REGULATOR_TPS68470=m
-CONFIG_COMMON_CLK_TPS68470=m
-
-#
-# Cameras: Sensor drivers
-#
-CONFIG_VIDEO_OV5693=m
-CONFIG_VIDEO_OV8865=m
-
-#
-# ALS Sensor for Surface Book 3, Surface Laptop 3, Surface Pro 7
-#
-CONFIG_APDS9960=m
-
-#
-# Other Drivers
-#
-CONFIG_INPUT_SOC_BUTTON_ARRAY=m
-CONFIG_SURFACE_3_BUTTON=m
-CONFIG_SURFACE_3_POWER_OPREGION=m
-CONFIG_SURFACE_PRO3_BUTTON=m
-CONFIG_SURFACE_GPE=m
-CONFIG_SURFACE_BOOK1_DGPU_SWITCH=m
diff --git a/configs/surface-5.17.config b/configs/surface-5.17.config
deleted file mode 100644
index 90a8eb160..000000000
--- a/configs/surface-5.17.config
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# Surface Aggregator Module
-#
-CONFIG_SURFACE_AGGREGATOR=m
-CONFIG_SURFACE_AGGREGATOR_ERROR_INJECTION=n
-CONFIG_SURFACE_AGGREGATOR_BUS=y
-CONFIG_SURFACE_AGGREGATOR_CDEV=m
-CONFIG_SURFACE_AGGREGATOR_HUB=m
-CONFIG_SURFACE_AGGREGATOR_REGISTRY=m
-
-CONFIG_SURFACE_ACPI_NOTIFY=m
-CONFIG_SURFACE_DTX=m
-CONFIG_SURFACE_KIP_TABLET_SWITCH=m
-CONFIG_SURFACE_PLATFORM_PROFILE=m
-
-CONFIG_SURFACE_HID=m
-CONFIG_SURFACE_KBD=m
-
-CONFIG_BATTERY_SURFACE=m
-CONFIG_CHARGER_SURFACE=m
-
-#
-# Surface Hotplug
-#
-CONFIG_SURFACE_HOTPLUG=m
-
-#
-# IPTS touchscreen
-#
-# This only enables the user interface for IPTS data.
-# For the touchscreen to work, you need to install iptsd.
-#
-CONFIG_MISC_IPTS=m
-
-#
-# Cameras: IPU3
-#
-CONFIG_VIDEO_DW9719=m
-CONFIG_VIDEO_IPU3_IMGU=m
-CONFIG_VIDEO_IPU3_CIO2=m
-CONFIG_CIO2_BRIDGE=y
-CONFIG_INTEL_SKL_INT3472=m
-CONFIG_REGULATOR_TPS68470=m
-CONFIG_COMMON_CLK_TPS68470=m
-
-#
-# Cameras: Sensor drivers
-#
-CONFIG_VIDEO_OV5693=m
-CONFIG_VIDEO_OV8865=m
-
-#
-# ALS Sensor for Surface Book 3, Surface Laptop 3, Surface Pro 7
-#
-CONFIG_APDS9960=m
-
-#
-# Other Drivers
-#
-CONFIG_INPUT_SOC_BUTTON_ARRAY=m
-CONFIG_SURFACE_3_POWER_OPREGION=m
-CONFIG_SURFACE_PRO3_BUTTON=m
-CONFIG_SURFACE_GPE=m
-CONFIG_SURFACE_BOOK1_DGPU_SWITCH=m
diff --git a/configs/surface-5.18.config b/configs/surface-5.18.config
deleted file mode 100644
index 0bb50d4a6..000000000
--- a/configs/surface-5.18.config
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# Surface Aggregator Module
-#
-CONFIG_SURFACE_AGGREGATOR=m
-CONFIG_SURFACE_AGGREGATOR_ERROR_INJECTION=n
-CONFIG_SURFACE_AGGREGATOR_BUS=y
-CONFIG_SURFACE_AGGREGATOR_CDEV=m
-CONFIG_SURFACE_AGGREGATOR_HUB=m
-CONFIG_SURFACE_AGGREGATOR_REGISTRY=m
-CONFIG_SURFACE_AGGREGATOR_TABLET_SWITCH=m
-
-CONFIG_SURFACE_ACPI_NOTIFY=m
-CONFIG_SURFACE_DTX=m
-CONFIG_SURFACE_PLATFORM_PROFILE=m
-
-CONFIG_SURFACE_HID=m
-CONFIG_SURFACE_KBD=m
-
-CONFIG_BATTERY_SURFACE=m
-CONFIG_CHARGER_SURFACE=m
-
-#
-# Surface Hotplug
-#
-CONFIG_SURFACE_HOTPLUG=m
-
-#
-# IPTS touchscreen
-#
-# This only enables the user interface for IPTS data.
-# For the touchscreen to work, you need to install iptsd.
-#
-CONFIG_MISC_IPTS=m
-
-#
-# Cameras: IPU3
-#
-CONFIG_VIDEO_DW9719=m
-CONFIG_VIDEO_IPU3_IMGU=m
-CONFIG_VIDEO_IPU3_CIO2=m
-CONFIG_CIO2_BRIDGE=y
-CONFIG_INTEL_SKL_INT3472=m
-CONFIG_REGULATOR_TPS68470=m
-CONFIG_COMMON_CLK_TPS68470=m
-
-#
-# Cameras: Sensor drivers
-#
-CONFIG_VIDEO_OV5693=m
-CONFIG_VIDEO_OV8865=m
-
-#
-# ALS Sensor for Surface Book 3, Surface Laptop 3, Surface Pro 7
-#
-CONFIG_APDS9960=m
-
-#
-# Other Drivers
-#
-CONFIG_INPUT_SOC_BUTTON_ARRAY=m
-CONFIG_SURFACE_3_POWER_OPREGION=m
-CONFIG_SURFACE_PRO3_BUTTON=m
-CONFIG_SURFACE_GPE=m
-CONFIG_SURFACE_BOOK1_DGPU_SWITCH=m
diff --git a/configs/surface-5.19.config b/configs/surface-5.19.config
deleted file mode 100644
index 0bb50d4a6..000000000
--- a/configs/surface-5.19.config
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# Surface Aggregator Module
-#
-CONFIG_SURFACE_AGGREGATOR=m
-CONFIG_SURFACE_AGGREGATOR_ERROR_INJECTION=n
-CONFIG_SURFACE_AGGREGATOR_BUS=y
-CONFIG_SURFACE_AGGREGATOR_CDEV=m
-CONFIG_SURFACE_AGGREGATOR_HUB=m
-CONFIG_SURFACE_AGGREGATOR_REGISTRY=m
-CONFIG_SURFACE_AGGREGATOR_TABLET_SWITCH=m
-
-CONFIG_SURFACE_ACPI_NOTIFY=m
-CONFIG_SURFACE_DTX=m
-CONFIG_SURFACE_PLATFORM_PROFILE=m
-
-CONFIG_SURFACE_HID=m
-CONFIG_SURFACE_KBD=m
-
-CONFIG_BATTERY_SURFACE=m
-CONFIG_CHARGER_SURFACE=m
-
-#
-# Surface Hotplug
-#
-CONFIG_SURFACE_HOTPLUG=m
-
-#
-# IPTS touchscreen
-#
-# This only enables the user interface for IPTS data.
-# For the touchscreen to work, you need to install iptsd.
-#
-CONFIG_MISC_IPTS=m
-
-#
-# Cameras: IPU3
-#
-CONFIG_VIDEO_DW9719=m
-CONFIG_VIDEO_IPU3_IMGU=m
-CONFIG_VIDEO_IPU3_CIO2=m
-CONFIG_CIO2_BRIDGE=y
-CONFIG_INTEL_SKL_INT3472=m
-CONFIG_REGULATOR_TPS68470=m
-CONFIG_COMMON_CLK_TPS68470=m
-
-#
-# Cameras: Sensor drivers
-#
-CONFIG_VIDEO_OV5693=m
-CONFIG_VIDEO_OV8865=m
-
-#
-# ALS Sensor for Surface Book 3, Surface Laptop 3, Surface Pro 7
-#
-CONFIG_APDS9960=m
-
-#
-# Other Drivers
-#
-CONFIG_INPUT_SOC_BUTTON_ARRAY=m
-CONFIG_SURFACE_3_POWER_OPREGION=m
-CONFIG_SURFACE_PRO3_BUTTON=m
-CONFIG_SURFACE_GPE=m
-CONFIG_SURFACE_BOOK1_DGPU_SWITCH=m
diff --git a/configs/surface-5.4.config b/configs/surface-5.4.config
deleted file mode 100644
index 6f4df156f..000000000
--- a/configs/surface-5.4.config
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Surface Aggregator Module
-#
-CONFIG_SURFACE_AGGREGATOR=m
-CONFIG_SURFACE_AGGREGATOR_ERROR_INJECTION=n
-CONFIG_SURFACE_AGGREGATOR_BUS=y
-CONFIG_SURFACE_AGGREGATOR_CDEV=m
-CONFIG_SURFACE_AGGREGATOR_REGISTRY=m
-
-CONFIG_SURFACE_ACPI_NOTIFY=m
-CONFIG_SURFACE_DTX=m
-CONFIG_SURFACE_PERFMODE=m
-
-CONFIG_SURFACE_HID=m
-CONFIG_SURFACE_KBD=m
-
-CONFIG_BATTERY_SURFACE=m
-CONFIG_CHARGER_SURFACE=m
-
-#
-# Surface Hotplug
-#
-CONFIG_SURFACE_HOTPLUG=m
-
-#
-# IPTS touchscreen
-#
-CONFIG_TOUCHSCREEN_IPTS=m
-
-#
-# ALS Sensor for Surface Book 3, Surface Laptop 3, Surface Pro 7
-#
-CONFIG_APDS9960=m
-
-#
-# Other Drivers
-#
-CONFIG_INPUT_SOC_BUTTON_ARRAY=m
-CONFIG_SURFACE_3_BUTTON=m
-CONFIG_SURFACE_3_POWER_OPREGION=m
-CONFIG_SURFACE_PRO3_BUTTON=m
-CONFIG_SURFACE_GPE=m
-CONFIG_SURFACE_BOOK1_DGPU_SWITCH=m
diff --git a/configs/surface-5.5.config b/configs/surface-5.5.config
deleted file mode 100644
index 490b55421..000000000
--- a/configs/surface-5.5.config
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Surface Aggregator Module
-#
-CONFIG_GPIO_SYSFS=y                         # required for SURFACE_SAM_HPS
-CONFIG_SURFACE_SAM=m
-CONFIG_SURFACE_SAM_SSH=m
-CONFIG_SURFACE_SAM_SSH_DEBUG_DEVICE=y
-CONFIG_SURFACE_SAM_SAN=m
-CONFIG_SURFACE_SAM_VHF=m
-CONFIG_SURFACE_SAM_DTX=m
-CONFIG_SURFACE_SAM_HPS=m
-CONFIG_SURFACE_SAM_SID=m
-CONFIG_SURFACE_SAM_SID_GPELID=m
-CONFIG_SURFACE_SAM_SID_PERFMODE=m
-CONFIG_SURFACE_SAM_SID_VHF=m
-CONFIG_SURFACE_SAM_SID_POWER=m
-
-#
-# IPTS touchscreen
-#
-CONFIG_TOUCHSCREEN_IPTS=m
-
-#
-# Other Drivers
-#
-CONFIG_INPUT_SOC_BUTTON_ARRAY=m
-CONFIG_SURFACE_3_BUTTON=m
-CONFIG_SURFACE_3_POWER_OPREGION=m
-CONFIG_SURFACE_PRO3_BUTTON=m
diff --git a/configs/surface-5.6.config b/configs/surface-5.6.config
deleted file mode 100644
index 490b55421..000000000
--- a/configs/surface-5.6.config
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Surface Aggregator Module
-#
-CONFIG_GPIO_SYSFS=y                         # required for SURFACE_SAM_HPS
-CONFIG_SURFACE_SAM=m
-CONFIG_SURFACE_SAM_SSH=m
-CONFIG_SURFACE_SAM_SSH_DEBUG_DEVICE=y
-CONFIG_SURFACE_SAM_SAN=m
-CONFIG_SURFACE_SAM_VHF=m
-CONFIG_SURFACE_SAM_DTX=m
-CONFIG_SURFACE_SAM_HPS=m
-CONFIG_SURFACE_SAM_SID=m
-CONFIG_SURFACE_SAM_SID_GPELID=m
-CONFIG_SURFACE_SAM_SID_PERFMODE=m
-CONFIG_SURFACE_SAM_SID_VHF=m
-CONFIG_SURFACE_SAM_SID_POWER=m
-
-#
-# IPTS touchscreen
-#
-CONFIG_TOUCHSCREEN_IPTS=m
-
-#
-# Other Drivers
-#
-CONFIG_INPUT_SOC_BUTTON_ARRAY=m
-CONFIG_SURFACE_3_BUTTON=m
-CONFIG_SURFACE_3_POWER_OPREGION=m
-CONFIG_SURFACE_PRO3_BUTTON=m
diff --git a/configs/surface-5.7.config b/configs/surface-5.7.config
deleted file mode 100644
index e0bdd3b70..000000000
--- a/configs/surface-5.7.config
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Surface Aggregator Module
-#
-CONFIG_GPIO_SYSFS=y                         # required for SURFACE_SAM_HPS
-CONFIG_SURFACE_SAM=m
-CONFIG_SURFACE_SAM_SSH=m
-CONFIG_SURFACE_SAM_SSH_ERROR_INJECTION=n
-CONFIG_SURFACE_SAM_DEBUGFS=m
-CONFIG_SURFACE_SAM_DEVICE_HUB=m
-CONFIG_SURFACE_SAM_SAN=m
-CONFIG_SURFACE_SAM_KBD=m
-CONFIG_SURFACE_SAM_DTX=m
-CONFIG_SURFACE_SAM_HPS=m
-CONFIG_SURFACE_SAM_PERFMODE=m
-CONFIG_SURFACE_SAM_HID=m
-CONFIG_SURFACE_SAM_PSY=m
-
-
-#
-# IPTS touchscreen
-#
-CONFIG_TOUCHSCREEN_IPTS=m
-
-#
-# Other Drivers
-#
-CONFIG_INPUT_SOC_BUTTON_ARRAY=m
-CONFIG_SURFACE_3_BUTTON=m
-CONFIG_SURFACE_3_POWER_OPREGION=m
-CONFIG_SURFACE_PRO3_BUTTON=m
-CONFIG_SURFACE_GPE=m
diff --git a/configs/surface-5.8.config b/configs/surface-5.8.config
deleted file mode 100644
index 285d92703..000000000
--- a/configs/surface-5.8.config
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Surface Aggregator Module
-#
-CONFIG_SURFACE_AGGREGATOR=m
-CONFIG_SURFACE_AGGREGATOR_ERROR_INJECTION=n
-CONFIG_SURFACE_AGGREGATOR_BUS=y
-CONFIG_SURFACE_AGGREGATOR_CDEV=m
-CONFIG_SURFACE_AGGREGATOR_REGISTRY=m
-CONFIG_SURFACE_ACPI_NOTIFY=m
-CONFIG_SURFACE_BATTERY=m
-CONFIG_SURFACE_DTX=m
-CONFIG_SURFACE_HID=m
-CONFIG_SURFACE_HOTPLUG=m
-CONFIG_SURFACE_PERFMODE=m
-
-#
-# IPTS touchscreen
-#
-# This only enables the user interface for IPTS data.
-# For the touchscreen to work, you need to install iptsd.
-#
-CONFIG_MISC_IPTS=m
-
-#
-# Other Drivers
-#
-CONFIG_INPUT_SOC_BUTTON_ARRAY=m
-CONFIG_SURFACE_3_BUTTON=m
-CONFIG_SURFACE_3_POWER_OPREGION=m
-CONFIG_SURFACE_PRO3_BUTTON=m
-CONFIG_SURFACE_GPE=m
-CONFIG_SURFACE_BOOK1_DGPU_SWITCH=m
diff --git a/configs/surface-5.9.config b/configs/surface-5.9.config
deleted file mode 100644
index 80d211882..000000000
--- a/configs/surface-5.9.config
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Surface Aggregator Module
-#
-CONFIG_SURFACE_AGGREGATOR=m
-CONFIG_SURFACE_AGGREGATOR_ERROR_INJECTION=n
-CONFIG_SURFACE_AGGREGATOR_BUS=y
-CONFIG_SURFACE_AGGREGATOR_CDEV=m
-CONFIG_SURFACE_AGGREGATOR_REGISTRY=m
-CONFIG_SURFACE_ACPI_NOTIFY=m
-CONFIG_SURFACE_BATTERY=m
-CONFIG_SURFACE_DTX=m
-CONFIG_SURFACE_HID=m
-CONFIG_SURFACE_PERFMODE=m
-
-#
-# Surface Hotplug
-#
-CONFIG_SURFACE_HOTPLUG=m
-
-#
-# IPTS touchscreen
-#
-# This only enables the user interface for IPTS data.
-# For the touchscreen to work, you need to install iptsd.
-#
-CONFIG_MISC_IPTS=m
-
-#
-# Other Drivers
-#
-CONFIG_INPUT_SOC_BUTTON_ARRAY=m
-CONFIG_SURFACE_3_BUTTON=m
-CONFIG_SURFACE_3_POWER_OPREGION=m
-CONFIG_SURFACE_PRO3_BUTTON=m
-CONFIG_SURFACE_GPE=m
-CONFIG_SURFACE_BOOK1_DGPU_SWITCH=m
diff --git a/configs/surface-6.0.config b/configs/surface-6.0.config
deleted file mode 100644
index fb0d4fafb..000000000
--- a/configs/surface-6.0.config
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-# Surface Aggregator Module
-#
-CONFIG_SURFACE_AGGREGATOR=m
-CONFIG_SURFACE_AGGREGATOR_ERROR_INJECTION=n
-CONFIG_SURFACE_AGGREGATOR_BUS=y
-CONFIG_SURFACE_AGGREGATOR_CDEV=m
-CONFIG_SURFACE_AGGREGATOR_HUB=m
-CONFIG_SURFACE_AGGREGATOR_REGISTRY=m
-CONFIG_SURFACE_AGGREGATOR_TABLET_SWITCH=m
-
-CONFIG_SURFACE_ACPI_NOTIFY=m
-CONFIG_SURFACE_DTX=m
-CONFIG_SURFACE_PLATFORM_PROFILE=m
-
-CONFIG_SURFACE_HID=m
-CONFIG_SURFACE_KBD=m
-
-CONFIG_BATTERY_SURFACE=m
-CONFIG_CHARGER_SURFACE=m
-
-#
-# Surface Hotplug
-#
-CONFIG_SURFACE_HOTPLUG=m
-
-#
-# IPTS touchscreen
-#
-# This only enables the user interface for IPTS data.
-# For the touchscreen to work, you need to install iptsd.
-#
-CONFIG_MISC_IPTS=m
-
-#
-# Cameras: IPU3
-#
-CONFIG_VIDEO_DW9719=m
-CONFIG_VIDEO_IPU3_IMGU=m
-CONFIG_VIDEO_IPU3_CIO2=m
-CONFIG_CIO2_BRIDGE=y
-CONFIG_INTEL_SKL_INT3472=m
-CONFIG_REGULATOR_TPS68470=m
-CONFIG_COMMON_CLK_TPS68470=m
-
-#
-# Cameras: Sensor drivers
-#
-CONFIG_VIDEO_OV5693=m
-CONFIG_VIDEO_OV7251=m
-CONFIG_VIDEO_OV8865=m
-
-#
-# ALS Sensor for Surface Book 3, Surface Laptop 3, Surface Pro 7
-#
-CONFIG_APDS9960=m
-
-#
-# Other Drivers
-#
-CONFIG_INPUT_SOC_BUTTON_ARRAY=m
-CONFIG_SURFACE_3_POWER_OPREGION=m
-CONFIG_SURFACE_PRO3_BUTTON=m
-CONFIG_SURFACE_GPE=m
-CONFIG_SURFACE_BOOK1_DGPU_SWITCH=m