diff --git a/BoardConfigExtra.mk b/BoardConfigExtra.mk
index 3bbf93a..4bc45a4 100644
--- a/BoardConfigExtra.mk
+++ b/BoardConfigExtra.mk
@@ -1,10 +1,3 @@
-# Overlay
-#DEVICE_PACKAGE_OVERLAYS += vendor/extra/blur/overlay
+# Signing
+PRODUCT_DEFAULT_DEV_CERTIFICATE := vendor/certs/releasekey
 
-# Blur
-TARGET_HAVE_UI_BLUR := true
-
-# QC Perf
-#TARGET_HAVE_QC_PERF := true
-
--include vendor/rashed/BoardConfigExtra.mk
diff --git a/lineage-package_cache.rc b/lineage-package_cache.rc
deleted file mode 100644
index 86ab0a8..0000000
--- a/lineage-package_cache.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-on post-fs-data
-    setprop pm.boot.disable_package_cache true
diff --git a/product.mk b/product.mk
index 3f32130..e2d3ce5 100644
--- a/product.mk
+++ b/product.mk
@@ -1,17 +1,8 @@
-# Disable package cache on all builds
-PRODUCT_COPY_FILES += \
-    vendor/extra/lineage-package_cache.rc:system/etc/init/lineage-package_cache.rc
-
 PRODUCT_SYSTEM_DEFAULT_PROPERTIES += ro.opa.eligible_device=true
 
 # Themes
 DEVICE_PACKAGE_OVERLAYS += vendor/extra/overlay
 PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += vendor/extra/overlay
-PRODUCT_SYSTEM_DEFAULT_PROPERTIES += ro.boot.vendor.overlay.theme=com.google.android.theme.pixel
-PRODUCT_SYSTEM_DEFAULT_PROPERTIES += ro.com.google.ime.theme_id=5
-PRODUCT_PACKAGES += \
-    GoogleFonts \
-    PixelTheme
 
 ADDITIONAL_FONTS_FILE += vendor/extra/google-fonts.xml
 
@@ -21,7 +12,6 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
 
 -include vendor/google_pixel/product.mk
 
--include vendor/rashed/product.mk
 ifneq ($(DISABLE_GAPPS),true)
 -include vendor/extra/gapps.mk
-endif
+endif # Disable GApps