diff --git a/device-tangorpro.mk b/device-tangorpro.mk
index 06f3f79..2c82457 100644
--- a/device-tangorpro.mk
+++ b/device-tangorpro.mk
@@ -24,13 +24,6 @@ TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_TANGORPRO_DIR)/kernel-headers
 
 BOARD_WITHOUT_RADIO := true
 
-$(call inherit-product-if-exists, vendor/google_devices/tangorpro/prebuilts/device-vendor-tangorpro.mk)
-$(call inherit-product-if-exists, vendor/google_devices/gs201/prebuilts/device-vendor.mk)
-$(call inherit-product-if-exists, vendor/google_devices/gs201/proprietary/device-vendor.mk)
-$(call inherit-product-if-exists, vendor/google_devices/tangorpro/proprietary/tangorpro/device-vendor-tangorpro.mk)
-$(call inherit-product-if-exists, vendor/google_devices/tangorpro/proprietary/WallpapersTangorpro.mk)
-$(call inherit-product-if-exists, vendor/google_devices/tangorpro/proprietary/device-vendor.mk)
-
 $(call inherit-product, device/google/tangorpro/uwb/uwb_calibration_country.mk)
 
 DEVICE_PACKAGE_OVERLAYS += device/google/tangorpro/tangorpro/overlay
@@ -175,9 +168,6 @@ $(call soong_config_set,fp_hal_feature,pixel_product, product_b)
 # Fingerprint config
 include device/google/tangorpro/fingerprint_config.mk
 
-# Trusty liboemcrypto.so
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts
-
 # Wifi SAP Interface Name
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.vendor.wifi.sap.interface=wlan1
@@ -207,10 +197,6 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
 PRODUCT_COPY_FILES += \
 	frameworks/native/data/etc/android.software.telecom.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.telecom.xml
 
-# Trusty libbinder_trusty_paidl.so and libcast_auth.so
-PRODUCT_SOONG_NAMESPACES += \
-        vendor/google/trusty/common
-
 # Cast auth
 PRODUCT_COPY_FILES += \
         device/google/tangorpro/cast_auth/tangor_ica.crt:$(TARGET_COPY_OUT_VENDOR)/etc/cert-chain.crt
@@ -254,10 +240,6 @@ PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.camera.increase_thread_priority_nodes_stop=true \
     persist.vendor.camera.debug.bypass_csi_link_crc_error=true
 
-# Trusty libbinder_trusty_paidl.so and libcast_auth.so
-PRODUCT_SOONG_NAMESPACES += \
-	vendor/lib64
-
 # MIPI Coex Configs
 PRODUCT_COPY_FILES += \
     device/google/tangorpro/radio/tangor_camera_front_mipi_coex_table.csv:$(TARGET_COPY_OUT_VENDOR)/etc/modem/camera_front_mipi_coex_table.csv \
@@ -315,8 +297,3 @@ PRODUCT_PACKAGES += \
 # SKU specific RROs
 PRODUCT_PACKAGES += \
     SettingsOverlayGTU8P
-
-# PlayVideos
-PLAYVIDEOS_VERSION_DIR := 4.38.72.77
-$(call soong_config_set_bool,playvideos,use_device_specific_version,true)
-PRODUCT_SOONG_NAMESPACES += vendor/unbundled_google/packages/PlayVideos/$(PLAYVIDEOS_VERSION_DIR)
diff --git a/tangorpro/BoardConfig.mk b/tangorpro/BoardConfig.mk
index 79c44d7..8edcd8c 100644
--- a/tangorpro/BoardConfig.mk
+++ b/tangorpro/BoardConfig.mk
@@ -31,9 +31,7 @@ USES_DEVICE_GOOGLE_TANGORPRO := true
 BOARD_KERNEL_CMDLINE += swiotlb=noforce
 
 include device/google/gs201/BoardConfig-common.mk
--include vendor/google_devices/gs201/prebuilts/BoardConfigVendor.mk
 include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
--include vendor/google_devices/tangorpro/proprietary/BoardConfigVendor.mk
 include device/google/tangorpro/sepolicy/tangorpro-sepolicy.mk
 include device/google/tangorpro/wifi/BoardConfig-wifi.mk
 
diff --git a/uwb/uwb_calibration.mk b/uwb/uwb_calibration.mk
index 4a00743..d33a9a1 100644
--- a/uwb/uwb_calibration.mk
+++ b/uwb/uwb_calibration.mk
@@ -14,7 +14,6 @@
 # limitations under the License.
 
 # UWB - ultra wide band
-$(call inherit-product-if-exists, vendor/qorvo/uwb/uwb.mk)
 
 LOCAL_UWB_CAL_DIR=device/google/tangorpro/uwb