diff --git a/device.mk b/device.mk
index 8105d606..0635f923 100644
--- a/device.mk
+++ b/device.mk
@@ -502,6 +502,7 @@ PRODUCT_PACKAGES += \
 PANTHER_PRODUCT := %panther
 CHEETAH_PRODUCT := %cheetah
 LYNX_PRODUCT := %lynx
+FELIX_PRODUCT := %felix
 CLOUDRIPPER_PRODUCT := %cloudripper
 ifneq (,$(filter $(PANTHER_PRODUCT), $(TARGET_PRODUCT)))
         LOCAL_TARGET_PRODUCT := panther
@@ -509,6 +510,8 @@ else ifneq (,$(filter $(CHEETAH_PRODUCT), $(TARGET_PRODUCT)))
         LOCAL_TARGET_PRODUCT := cheetah
 else ifneq (,$(filter $(LYNX_PRODUCT), $(TARGET_PRODUCT)))
         LOCAL_TARGET_PRODUCT := lynx
+else ifneq (,$(filter $(FELIX_PRODUCT), $(TARGET_PRODUCT)))
+        LOCAL_TARGET_PRODUCT := felix
 else ifneq (,$(filter $(CLOUDRIPPER_PRODUCT), $(TARGET_PRODUCT)))
         LOCAL_TARGET_PRODUCT := cloudripper
 else
@@ -570,7 +573,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_ramdisk.mk)
 
 # Titan-M
 ifeq (,$(filter true, $(BOARD_WITHOUT_DTLS)))
-include hardware/google/pixel/dauntless/dauntless.mk
 include device/google/gs-common/dauntless/gsc.mk
 endif
 
diff --git a/gnss/47765/config/lhd.conf b/gnss/47765/config/lhd.conf
deleted file mode 100644
index efde25ba..00000000
--- a/gnss/47765/config/lhd.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-LheName=bbd
-
-LheRsmResetTimeoutMS=10000
-GpioNStdbyPath=/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby
-
-LhePatch=/vendor/firmware/SensorHub.patch
-Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG
-LheConsole=/data/vendor/gps/LheConsole
-
-LogEnabled=true
-Log=JAVA
-LogDirectory=/sdcard/gps/broadcom/storage
-
-LheBbdPacket=/dev/ttyBCM
-
-LheBbdControl=/dev/bbd_control
-
-# LheBbdSensor=/dev/bbd_sensor
-
-LheFailSafe=/data/vendor/gps/logs/esw-crash-dump.txt
-LogLevel=*:I
-
-NvStorageDir=/data/vendor/gps/
-
-# Enable BBD debugging at these stages:
-# LheDriverDebugFlags=PATCH_BBD:LHE_BBD:FSC_BBD
-
-LheAutoBaudDelayMS=10
-TrafficLogEnabled=false
-SecondaryConfigPath=/data/vendor/gps/overlay/lhd_overlay.conf
-
-SkipSensorWakeLock=true
-LoggerWakeLockEnable=false
diff --git a/gnss/47765/config/lhd_user.conf b/gnss/47765/config/lhd_user.conf
deleted file mode 100644
index 0216ace9..00000000
--- a/gnss/47765/config/lhd_user.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-LheName=bbd
-
-LheRsmResetTimeoutMS=10000
-GpioNStdbyPath=/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby
-
-LhePatch=/vendor/firmware/SensorHub.patch
-Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG
-# LheConsole=/data/vendor/gps/LheConsole
-
-LogEnabled=false
-Log=JAVA
-LogDirectory=/sdcard/gps/broadcom/storage
-
-LheBbdPacket=/dev/ttyBCM
-
-LheBbdControl=/dev/bbd_control
-
-# LheBbdSensor=/dev/bbd_sensor
-
-# LheFailSafe=/data/vendor/gps/esw-crash-dump.txt
-
-NvStorageDir=/data/vendor/gps/
-
-# Enable BBD debugging at these stages:
-# LheDriverDebugFlags=PATCH_BBD:LHE_BBD:FSC_BBD
-
-LheAutoBaudDelayMS=10
-TrafficLogEnabled=false
-
-SkipSensorWakeLock=true
-LoggerWakeLockEnable=false
diff --git a/gnss/47765/config/scd.conf b/gnss/47765/config/scd.conf
deleted file mode 100644
index 43f9cd27..00000000
--- a/gnss/47765/config/scd.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-LogEnabled=true
-Log=JAVA
-LogDirectory=/sdcard/gps/broadcom/storage
-NvStorageDir=/data/vendor/gps/
-TcpConnectionTimeout=20
-SecondaryConfigPath=/data/vendor/gps/overlay/scd_overlay.conf
diff --git a/gnss/47765/config/scd_user.conf b/gnss/47765/config/scd_user.conf
deleted file mode 100644
index e75f209b..00000000
--- a/gnss/47765/config/scd_user.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-LogEnabled=false
-Log=JAVA
-LogDirectory=/sdcard/gps/broadcom/storage
-NvStorageDir=/data/vendor/gps/
-TcpConnectionTimeout=20
diff --git a/gnss/device-gnss.mk b/gnss/device-gnss.mk
index 08afe191..5c5c2606 100644
--- a/gnss/device-gnss.mk
+++ b/gnss/device-gnss.mk
@@ -3,16 +3,6 @@ PRODUCT_COPY_FILES += \
 	device/google/gs201/gnss/47765/config/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer \
 	device/google/gs201/gnss/47765/firmware/SensorHub.patch:$(TARGET_COPY_OUT_VENDOR)/firmware/SensorHub.patch
 
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-	PRODUCT_COPY_FILES += \
-		device/google/gs201/gnss/47765/config/lhd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
-		device/google/gs201/gnss/47765/config/scd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
-else
-	PRODUCT_COPY_FILES += \
-		device/google/gs201/gnss/47765/config/lhd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
-		device/google/gs201/gnss/47765/config/scd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
-endif
-
 PRODUCT_SOONG_NAMESPACES += \
 	device/google/gs201/gnss/47765
 
diff --git a/health/Health.cpp b/health/Health.cpp
index b69b7845..7d320582 100644
--- a/health/Health.cpp
+++ b/health/Health.cpp
@@ -28,7 +28,6 @@
 #include <health-impl/ChargerUtils.h>
 #include <pixelhealth/BatteryDefender.h>
 #include <pixelhealth/BatteryMetricsLogger.h>
-#include <pixelhealth/BatteryThermalControl.h>
 #include <pixelhealth/ChargerDetect.h>
 #include <pixelhealth/DeviceHealth.h>
 #include <pixelhealth/LowBatteryShutdownMetrics.h>
@@ -55,7 +54,6 @@ using aidl::android::hardware::health::charger::ChargerCallback;
 using aidl::android::hardware::health::charger::ChargerModeMain;
 using hardware::google::pixel::health::BatteryDefender;
 using hardware::google::pixel::health::BatteryMetricsLogger;
-using hardware::google::pixel::health::BatteryThermalControl;
 using hardware::google::pixel::health::DeviceHealth;
 using hardware::google::pixel::health::LowBatteryShutdownMetrics;
 using hardware::google::pixel::health::ChargerDetect;
@@ -70,8 +68,6 @@ constexpr char kVoltageAvg[] {FG_DIR "/voltage_now"};
 static BatteryDefender battDefender(WLC_DIR "/present",
     "/sys/devices/platform/google,charger/charge_start_level",
     "/sys/devices/platform/google,charger/charge_stop_level");
-static BatteryThermalControl battThermalControl(
-    "dev/thermal/tz-by-name/soc/mode");
 static BatteryMetricsLogger battMetricsLogger(kBatteryResistance, kBatteryOCV);
 static LowBatteryShutdownMetrics shutdownMetrics(kVoltageAvg);
 static DeviceHealth deviceHealth;
@@ -147,7 +143,6 @@ void private_healthd_board_init(struct healthd_config *hc) {
 int private_healthd_board_battery_update(HealthInfo *health_info) {
   int batt_level;
   deviceHealth.update(health_info);
-  battThermalControl.updateThermalState(*health_info);
   battMetricsLogger.logBatteryProperties(*health_info);
   shutdownMetrics.logShutdownVoltage(*health_info);
   // Allow BatteryDefender to override online properties