diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc
index 87240446..66f58ada 100644
--- a/conf/init.gs101.rc
+++ b/conf/init.gs101.rc
@@ -743,12 +743,6 @@ on property:sys.boot_completed=1
     chown root system /sys/devices/platform/19000000.aoc/reset
     chmod 0220 /sys/devices/platform/19000000.aoc/reset
 
-# charger driver exposes now finer grain control, map demo mode to those properties
-# NOTE: demo mode can only be exit wiping data (which reset the persist properties)
-on property:sys.retaildemo.enabled=1
-    setprop persist.vendor.charge.stop.level 35
-    setprop persist.vendor.charge.start.level 30
-
 # Test Harness Mode default battery profile.
 on  property:persist.sys.test_harness=1 && property:persist.vendor.testing_battery_profile=0
     setprop persist.vendor.charge.stop.level 70
diff --git a/device.mk b/device.mk
index 2facc806..ff5d0bd6 100644
--- a/device.mk
+++ b/device.mk
@@ -34,14 +34,6 @@ VENDOR_SECURITY_PATCH = $(PLATFORM_SECURITY_PATCH)
 # Set boot SPL
 BOOT_SECURITY_PATCH = $(PLATFORM_SECURITY_PATCH)
 
-# TODO(b/207450311): Remove this flag once implemented
-USE_PIXEL_GRALLOC := false
-ifeq ($(USE_PIXEL_GRALLOC),true)
-	PRODUCT_SOONG_NAMESPACES += hardware/google/gchips/GrallocHAL
-else
-	PRODUCT_SOONG_NAMESPACES += hardware/google/gchips/gralloc4
-endif
-
 PRODUCT_SOONG_NAMESPACES += \
 	hardware/google/av \
 	hardware/google/gchips \