diff --git a/pawlet_rpi4.mk b/pawlet_rpi4.mk
index 2b2ec88..bbaab89 100644
--- a/pawlet_rpi4.mk
+++ b/pawlet_rpi4.mk
@@ -15,10 +15,6 @@ PRODUCT_CHARACTERISTICS := tablet,nosdcard
 # Remove unwanted packages
 $(call inherit-product, device/pawlet/rpi/remove_packages.mk)
 
-# Any additional packages to remove
-#PRODUCT_PACKAGES -= \
-#    name
-
 # Lawnchair integration
 $(call inherit-product-if-exists, vendor/lawnchair/lawnchair.mk)
 PRODUCT_PACKAGES += Lawnchair
@@ -28,29 +24,25 @@ PRODUCT_PACKAGES += \
     FrameworkResDevOxmcOverlay \
     pawlet-device-full
 
-# SELinux Policy Configuration
-BOARD_SEPOLICY_DIRS += \
-    frameworks/base/pawlet/sepolicy
-
 # FrameworkAPI properties
 PRODUCT_SYSTEM_PROPERTIES += \
     ro.pawlet.version=1.0 \
     ro.oxmc.os_name=PawletOS
 
-# LineageOS
+# SELinux Policy Configuration
+BOARD_SEPOLICY_DIRS += \
+    frameworks/base/pawlet/sepolicy
+
+# LineageOS packages/services
 PRODUCT_PACKAGES += \
-    Updater \
+#    Updater \
     LineageSetupWizard \
     privapp_whitelist_org.lineageos.setupwizard
 
-# Device identification
-
-# Internal identity
+# Device/Build identification
 PRODUCT_DEVICE := rpi4
 PRODUCT_NAME := pawlet_rpi4
 PRODUCT_SYSTEM_NAME := pawlet_rpi4
-
-# User-visible branding
 PRODUCT_BRAND := Pawlet
 PRODUCT_MODEL := Pawlet Pi 4
 PRODUCT_MANUFACTURER := Raspberry Pi Foundation