diff --git a/BoardConfig.mk b/BoardConfig.mk
index ee48eb1..db099ec 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -20,10 +20,6 @@ TARGET_2ND_CPU_VARIANT_RUNTIME := cortex-a75
 # Bootloader
 TARGET_BOOTLOADER_BOARD_NAME := sdm710
 TARGET_NO_BOOTLOADER := true
-BUILD_BROKEN_DUP_RULES := true
-BUILD_BROKEN_USES_BUILD_COPY_HEADERS := true
-BUILD_BROKEN_VINTF_PRODUCT_COPY_FILES := true
-BUILD_BROKEN_PREBUILT_ELF_FILES := true
 
 # Platform
 BOARD_USES_QCOM_HARDWARE := true
diff --git a/device.mk b/device.mk
index 98b34e7..d6c7578 100644
--- a/device.mk
+++ b/device.mk
@@ -155,7 +155,3 @@ PRODUCT_PACKAGES += \
 
 PRODUCT_BOOT_JARS += \
     WfdCommon
-
-# Wallpapers
-PRODUCT_PACKAGES += \
-    PixelLiveWallpaperPrebuilt
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 5dbfa54..99ec801 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -472,9 +472,6 @@
          The default is false. -->
     <bool name="config_lidControlsSleep">true</bool>
 
-    <!-- Workaround to trim baseband version's string of some devices with duplicated baseband string -->
-    <bool name="config_trim_baseband_version_string">true</bool>
-
     <!-- List of biometric sensors on the device, in decreasing strength. Consumed by AuthService
          when registering authenticators with BiometricService. Format must be ID:Modality:Strength,
          where: IDs are unique per device, Modality as defined in BiometricAuthenticator.java,
diff --git a/product_prop.mk b/product_prop.mk
index 0d89ab4..72757d1 100644
--- a/product_prop.mk
+++ b/product_prop.mk
@@ -1,7 +1,6 @@
 # Blurs
 PRODUCT_PRODUCT_PROPERTIES += \
    ro.surface_flinger.supports_background_blur=1 \
-   ro.sf.blurs_are_expensive=1 \
    persist.sys.sf.disable_blurs=1
 
 # Charger