diff --git a/bengal.mk b/bengal.mk
index 9b6ea06..9a7d561 100644
--- a/bengal.mk
+++ b/bengal.mk
@@ -220,9 +220,7 @@ PRODUCT_PACKAGES += \
 
 # Health
 PRODUCT_PACKAGES += \
-    android.hardware.health@2.1-impl:64 \
-    android.hardware.health@2.1-impl.recovery \
-    android.hardware.health@2.1-service
+    android.hardware.health-service.qti
 
 # HIDL
 PRODUCT_PACKAGES += \
diff --git a/product.prop b/product.prop
index ef6f8d2..a74f63c 100644
--- a/product.prop
+++ b/product.prop
@@ -1,9 +1,6 @@
 # App freezer
 ro.config.use_freezer=false
 
-# Charger
-ro.charger.enable_suspend=1
-
 # LMKD
 ro.lmk.kill_heaviest_task=true
 ro.lmk.swap_util_max=90
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index f312a1c..0fbfc1d 100755
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -741,13 +741,6 @@ service profiler_daemon /system/bin/profiler_daemon
     group root
     disabled
 
-service charger /system/bin/charger
-    class charger
-    user system
-    group system graphics input
-    capabilities SYS_BOOT
-    seclabel u:r:charger:s0
-
 #service diag_mdlog_start /system/vendor/bin/diag_mdlog
 #    class late_start
 #    user shell