diff --git a/universal7885-common/universal7885-common.mk b/universal7885-common/universal7885-common.mk
index 77bbd86..5c0aaa9 100644
--- a/universal7885-common/universal7885-common.mk
+++ b/universal7885-common/universal7885-common.mk
@@ -18,13 +18,6 @@ USE_LEGACY_BOOTANIMATION := true
 PRODUCT_ENFORCE_RRO_TARGETS := framework-res SystemUI Bluetooth
 PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS := # leave it empty
 
-# Disable APEX compression
-# Keep this after including updatable_apex.mk
-PRODUCT_COMPRESSED_APEX := false
-
-# Audio
-TARGET_EXCLUDES_AUDIOFX := true
-
 PRODUCT_PACKAGES += \
     android.hardware.audio@7.0-impl \
     android.hardware.audio.service \
@@ -185,7 +178,10 @@ PRODUCT_COPY_FILES += \
 
 # Overlays
 DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
+TARGET_ROM := $(shell cat $(LOCAL_PATH)/vendor_name)
+ifeq ($(TARGET_ROM), derp)
 DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay-derp
+endif
 
 # Permissions
 PRODUCT_COPY_FILES += \
@@ -303,7 +299,6 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/sysconfig/component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/component-overrides-bt.xml \
     $(LOCAL_PATH)/configs/sysconfig/pixel_eureka.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/pixel_eureka.xml
 
-
 # Thermal
 PRODUCT_PACKAGES += \
     android.hardware.thermal@1.0-impl \