diff --git a/service-cleaner.sh b/phh-on-boot.sh
similarity index 61%
rename from service-cleaner.sh
rename to phh-on-boot.sh
index f8f7287..f279bcb 100644
--- a/service-cleaner.sh
+++ b/phh-on-boot.sh
@@ -1,5 +1,10 @@
 #!/system/bin/sh
 
+if grep -qF android.hardware.boot /vendor/manifest.xml;then
+	bootctl mark-boot-successful
+fi
+
+#Clear looping services
 sleep 30
 getprop | \
     grep restarting | \
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index 14940ae..6710be5 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -2,4 +2,4 @@
 /system/bin/vndk-detect			u:object_r:vndk_detect_exec:s0
 /system/etc/usb_audio_policy_configuration.xml	u:object_r:vendor_configs_file:s0
 /system/bin/rw-system.sh u:object_r:phhsu_exec:s0
-/system/bin/service-cleaner.sh u:object_r:phhsu_exec:s0
+/system/bin/phh-on-boot.sh u:object_r:phhsu_exec:s0
diff --git a/vndk.rc b/vndk.rc
index 719bba8..80f039a 100644
--- a/vndk.rc
+++ b/vndk.rc
@@ -4,13 +4,12 @@
 	mount none /system/etc/usb_audio_policy_configuration.xml /vendor/etc/usb_audio_policy_configuration.xml bind
 	export LD_CONFIG_FILE /system/etc/ld.config.${persist.sys.vndk}.txt
 
-service phh_service_cleaner /system/bin/service-cleaner.sh
+service phh_on_boot /system/bin/phh-on-boot.sh
     oneshot
     disabled
 
 on property:sys.boot_completed=1
-    start phh_service_cleaner
-    exec u:r:phhsu_daemon:s0 root -- /system/bin/bootctl mark-boot-successful
+    start phh_on_boot
 
 on property:QC.HI6250=1
    write /sys/class/hw_power/charger/direct_charger/iin_thermal 2750