diff --git a/device-felix.mk b/device-felix.mk
index 6bab460..0e503ab 100644
--- a/device-felix.mk
+++ b/device-felix.mk
@@ -14,9 +14,6 @@
 # limitations under the License.
 #
 
-# Restrict the visibility of Android.bp files to improve build analysis time
-$(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
-
 TARGET_RECOVERY_DEFAULT_ROTATION := ROTATION_RIGHT
 
 TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_FELIX_VERSION)
@@ -24,13 +21,6 @@ TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_FELIX_VERSION)
 TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_FELIX_DIR)
 TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_FELIX_DIR)/kernel-headers
 
-$(call inherit-product-if-exists, vendor/google_devices/felix/prebuilts/device-vendor-felix.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/felix/proprietary/felix/device-vendor-felix.mk)
-$(call inherit-product-if-exists, vendor/google_devices/felix/proprietary/device-vendor.mk)
-$(call inherit-product-if-exists, vendor/google_devices/felix/proprietary/WallpapersFelix.mk)
-
 $(call inherit-product, device/google/felix/uwb/uwb_calibration_country.mk)
 
 DEVICE_PACKAGE_OVERLAYS += device/google/felix/felix/overlay
@@ -293,9 +283,6 @@ PRODUCT_PACKAGES += \
     SettingsOverlayG0B96 \
     SettingsOverlayG9FPL
 
-# Trusty liboemcrypto.so
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts
-
 # Set zram size
 PRODUCT_VENDOR_PROPERTIES += \
        vendor.zram.size=3g
diff --git a/felix/BoardConfig.mk b/felix/BoardConfig.mk
index 5097562..96990ef 100644
--- a/felix/BoardConfig.mk
+++ b/felix/BoardConfig.mk
@@ -38,9 +38,7 @@ BOARD_KERNEL_CMDLINE += s2mpg12-regulator.load_sequential=1
 USES_IDISPLAY_INTF_SEC := true
 
 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/felix/proprietary/BoardConfigVendor.mk
 include device/google/felix/sepolicy/felix-sepolicy.mk
 include device/google/felix/wifi/BoardConfig-wifi.mk
 
diff --git a/uwb/uwb_calibration.mk b/uwb/uwb_calibration.mk
index d6c9d0a..daffbec 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/felix/uwb