diff --git a/pawlet_rpi4.mk b/pawlet_rpi4.mk
index a4e4ccf..1205ee4 100644
--- a/pawlet_rpi4.mk
+++ b/pawlet_rpi4.mk
@@ -17,9 +17,9 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
 $(call enforce-product-packages-exist,com.android.ranging)
 
 # System apps
-PRODUCT_PACKAGES += \
-    ThemePicker \
-    SettingsIntelligence
+#PRODUCT_PACKAGES += \
+#    ThemePicker \
+#    SettingsIntelligence
 
 # Overlays (Mostly RaspberryVanilla)
 PRODUCT_PACKAGES += \
@@ -49,16 +49,16 @@ PRODUCT_PACKAGES += \
     pawlet-framework-res-overlay
 
 # FrameworkAPI properties
-PRODUCT_SYSTEM_PROPERTIES += \
-    ro.pawlet.version=1.0 \
-    ro.oxmc.os_name=PawletOS
+#PRODUCT_SYSTEM_PROPERTIES += \
+#    ro.pawlet.version=1.0 \
+#    ro.oxmc.os_name=PawletOS
 
 # Config Provisioner App and config
-PRODUCT_PACKAGES += \
-    ConfigProvisioner
+#PRODUCT_PACKAGES += \
+#    ConfigProvisioner
 
-PRODUCT_COPY_FILES += \
-    device/pawlet/rpi/configs/provisioner/vendor.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/config_provisioner/vendor.cfg
+#PRODUCT_COPY_FILES += \
+#    device/pawlet/rpi/configs/provisioner/vendor.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/config_provisioner/vendor.cfg
 
 # SELinux Policy Configuration
 BOARD_SEPOLICY_DIRS += \