diff --git a/init-common.rc b/init-common.rc
index 5ce4f69..8b4df84 100644
--- a/init-common.rc
+++ b/init-common.rc
@@ -44,3 +44,15 @@ on init && property:ro.boot.revision=MP1
 
 on boot && property:ro.build.type=userdebug
    write /sys/class/uio/uio1/device/rtel/rtel 1
+
+# charger driver exposes now finer grain control, map demo mode to those properties
+# demo mode can only be exit wipping data which will also reset the persist properties
+on property:sys.retaildemo.enabled=1
+    setprop persist.vendor.charge.stop.level 35
+    setprop persist.vendor.charge.start.level 30
+
+on property:persist.vendor.charge.stop.level=*
+    write /sys/module/htc_battery/parameters/charge_stop_level ${persist.vendor.charge.stop.level}
+
+on property:persist.vendor.charge.start.level=*
+    write /sys/module/htc_battery/parameters/charge_start_level ${persist.vendor.charge.start.level}
diff --git a/init.common.usb.rc b/init.common.usb.rc
index 629f0f6..19e93d1 100644
--- a/init.common.usb.rc
+++ b/init.common.usb.rc
@@ -3,11 +3,3 @@ import /vendor/etc/init/hw/init.wahoo.usb.rc
 on boot && property:ro.bootmode=usbradio && property:persist.sys.usb.usbradio.config=*
     setprop sys.usb.config "none"
     setprop sys.usb.config ${persist.sys.usb.usbradio.config}
-
-# battery driver settings for the retail demo environment where
-# the device will be perpertually plugged in to a power source
-on property:sys.retaildemo.enabled=1
-    write /sys/module/htc_battery/parameters/full_level_dis_chg 35
-
-on property:sys.retaildemo.enabled=0
-    write /sys/module/htc_battery/parameters/full_level_dis_chg 100