diff --git a/common.mk b/common.mk
index 8bf4205..451443a 100644
--- a/common.mk
+++ b/common.mk
@@ -163,9 +163,7 @@ PRODUCT_PACKAGES += \
 
 # Health
 PRODUCT_PACKAGES += \
-    android.hardware.health@2.1-impl \
-    android.hardware.health@2.1-impl.recovery \
-    android.hardware.health@2.1-service
+    android.hardware.health-service.qti
 
 # Init
 PRODUCT_COPY_FILES += \
diff --git a/product.prop b/product.prop
index 76f7175..b4b26d3 100644
--- a/product.prop
+++ b/product.prop
@@ -1,6 +1,3 @@
-# Charger
-ro.charger.enable_suspend=1
-
 # IMS
 ro.qcom.ims.use_moto_vt_ext=true