diff --git a/device-tangorpro.mk b/device-tangorpro.mk
index af37e2d..95aad3b 100644
--- a/device-tangorpro.mk
+++ b/device-tangorpro.mk
@@ -33,6 +33,9 @@ PRODUCT_PACKAGES += WifiOverlayT6pro
 # This flag need to be set before device/google/gs201/device.mk
 DISABLE_CAMERA_FS_AF := true
 
+# Disable baro, prox, hifi sensor related xml with a disable flag.
+DISABLE_SENSOR_BARO_PROX_HIFI := true
+
 include device/google/tangorpro/audio/tangorpro/audio-tables.mk
 include device/google/gs201/device-shipping-common.mk
 
@@ -116,15 +119,6 @@ FPC_MODULE_TYPE=1542_S
 # Trusty liboemcrypto.so
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts
 
-# GPS xml
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-        PRODUCT_COPY_FILES += \
-                device/google/tangorpro/gps.xml.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
-else
-        PRODUCT_COPY_FILES += \
-                device/google/tangorpro/gps_user.xml.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
-endif
-
 # DCK properties based on target
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.gms.dck.eligible_wcc=2