diff --git a/conf/init.caiman.rc b/conf/init.caiman.rc
index 14333b9a..cbbb1f92 100644
--- a/conf/init.caiman.rc
+++ b/conf/init.caiman.rc
@@ -36,44 +36,3 @@ on post-fs-data
 # Bluetooth
 on post-fs-data
     chown bluetooth system /proc/bluetooth/timesync
-
-# Haptics
-on property:vendor.all.modules.ready=1
-    mkdir /mnt/vendor/persist/haptics 0770 system system
-    chmod 770 /mnt/vendor/persist/haptics
-    chmod 440 /mnt/vendor/persist/haptics/cs40l26.cal
-    chown system system /mnt/vendor/persist/haptics
-    chown system system /mnt/vendor/persist/haptics/cs40l26.cal
-
-    chown system system /sys/bus/i2c/devices/6-0043/calibration/f0_stored
-    chown system system /sys/bus/i2c/devices/5-0043/calibration/f0_stored
-    chown system system /sys/bus/i2c/devices/4-0043/calibration/f0_stored
-    chown system system /sys/bus/i2c/devices/6-0043/calibration/q_stored
-    chown system system /sys/bus/i2c/devices/5-0043/calibration/q_stored
-    chown system system /sys/bus/i2c/devices/4-0043/calibration/q_stored
-    chown system system /sys/bus/i2c/devices/6-0043/calibration/redc_stored
-    chown system system /sys/bus/i2c/devices/5-0043/calibration/redc_stored
-    chown system system /sys/bus/i2c/devices/4-0043/calibration/redc_stored
-    chown system system /sys/bus/i2c/devices/6-0043/default/vibe_state
-    chown system system /sys/bus/i2c/devices/5-0043/default/vibe_state
-    chown system system /sys/bus/i2c/devices/4-0043/default/vibe_state
-    chown system system /sys/bus/i2c/devices/6-0043/default/num_waves
-    chown system system /sys/bus/i2c/devices/5-0043/default/num_waves
-    chown system system /sys/bus/i2c/devices/4-0043/default/num_waves
-    chown system system /sys/bus/i2c/devices/6-0043/default/f0_offset
-    chown system system /sys/bus/i2c/devices/5-0043/default/f0_offset
-    chown system system /sys/bus/i2c/devices/4-0043/default/f0_offset
-    chown system system /sys/bus/i2c/devices/6-0043/default/owt_free_space
-    chown system system /sys/bus/i2c/devices/5-0043/default/owt_free_space
-    chown system system /sys/bus/i2c/devices/4-0043/default/owt_free_space
-    chown system system /sys/bus/i2c/devices/6-0043/default/f0_comp_enable
-    chown system system /sys/bus/i2c/devices/5-0043/default/f0_comp_enable
-    chown system system /sys/bus/i2c/devices/4-0043/default/f0_comp_enable
-    chown system system /sys/bus/i2c/devices/6-0043/default/redc_comp_enable
-    chown system system /sys/bus/i2c/devices/5-0043/default/redc_comp_enable
-    chown system system /sys/bus/i2c/devices/4-0043/default/redc_comp_enable
-    chown system system /sys/bus/i2c/devices/6-0043/default/delay_before_stop_playback_us
-    chown system system /sys/bus/i2c/devices/5-0043/default/delay_before_stop_playback_us
-    chown system system /sys/bus/i2c/devices/4-0043/default/delay_before_stop_playback_us
-
-    enable vendor.vibrator.cs40l26
diff --git a/conf/init.komodo.rc b/conf/init.komodo.rc
index 96caf67c..ff31b7cb 100644
--- a/conf/init.komodo.rc
+++ b/conf/init.komodo.rc
@@ -36,44 +36,3 @@ on post-fs-data
 # Bluetooth
 on post-fs-data
     chown bluetooth system /proc/bluetooth/timesync
-
-# Haptics
-on property:vendor.all.modules.ready=1
-    mkdir /mnt/vendor/persist/haptics 0770 system system
-    chmod 770 /mnt/vendor/persist/haptics
-    chmod 440 /mnt/vendor/persist/haptics/cs40l26.cal
-    chown system system /mnt/vendor/persist/haptics
-    chown system system /mnt/vendor/persist/haptics/cs40l26.cal
-
-    chown system system /sys/bus/i2c/devices/6-0043/calibration/f0_stored
-    chown system system /sys/bus/i2c/devices/5-0043/calibration/f0_stored
-    chown system system /sys/bus/i2c/devices/4-0043/calibration/f0_stored
-    chown system system /sys/bus/i2c/devices/6-0043/calibration/q_stored
-    chown system system /sys/bus/i2c/devices/5-0043/calibration/q_stored
-    chown system system /sys/bus/i2c/devices/4-0043/calibration/q_stored
-    chown system system /sys/bus/i2c/devices/6-0043/calibration/redc_stored
-    chown system system /sys/bus/i2c/devices/5-0043/calibration/redc_stored
-    chown system system /sys/bus/i2c/devices/4-0043/calibration/redc_stored
-    chown system system /sys/bus/i2c/devices/6-0043/default/vibe_state
-    chown system system /sys/bus/i2c/devices/5-0043/default/vibe_state
-    chown system system /sys/bus/i2c/devices/4-0043/default/vibe_state
-    chown system system /sys/bus/i2c/devices/6-0043/default/num_waves
-    chown system system /sys/bus/i2c/devices/5-0043/default/num_waves
-    chown system system /sys/bus/i2c/devices/4-0043/default/num_waves
-    chown system system /sys/bus/i2c/devices/6-0043/default/f0_offset
-    chown system system /sys/bus/i2c/devices/5-0043/default/f0_offset
-    chown system system /sys/bus/i2c/devices/4-0043/default/f0_offset
-    chown system system /sys/bus/i2c/devices/6-0043/default/owt_free_space
-    chown system system /sys/bus/i2c/devices/5-0043/default/owt_free_space
-    chown system system /sys/bus/i2c/devices/4-0043/default/owt_free_space
-    chown system system /sys/bus/i2c/devices/6-0043/default/f0_comp_enable
-    chown system system /sys/bus/i2c/devices/5-0043/default/f0_comp_enable
-    chown system system /sys/bus/i2c/devices/4-0043/default/f0_comp_enable
-    chown system system /sys/bus/i2c/devices/6-0043/default/redc_comp_enable
-    chown system system /sys/bus/i2c/devices/5-0043/default/redc_comp_enable
-    chown system system /sys/bus/i2c/devices/4-0043/default/redc_comp_enable
-    chown system system /sys/bus/i2c/devices/6-0043/default/delay_before_stop_playback_us
-    chown system system /sys/bus/i2c/devices/5-0043/default/delay_before_stop_playback_us
-    chown system system /sys/bus/i2c/devices/4-0043/default/delay_before_stop_playback_us
-
-    enable vendor.vibrator.cs40l26
diff --git a/conf/init.ripcurrentpro.rc b/conf/init.ripcurrentpro.rc
index 6458636f..ebeb59f2 100644
--- a/conf/init.ripcurrentpro.rc
+++ b/conf/init.ripcurrentpro.rc
@@ -41,72 +41,19 @@ on post-fs-data
 on property:vendor.all.modules.ready=1
     mkdir /mnt/vendor/persist/haptics 0770 system system
     chmod 770 /mnt/vendor/persist/haptics
-    chmod 440 /mnt/vendor/persist/haptics/cs40l26.cal
     chmod 440 /mnt/vendor/persist/haptics/cs40l26_dual.cal
     chown system system /mnt/vendor/persist/haptics
-    chown system system /mnt/vendor/persist/haptics/cs40l26.cal
     chown system system /mnt/vendor/persist/haptics/cs40l26_dual.cal
 
-    chown system system /sys/bus/i2c/devices/6-0043/calibration/f0_stored
-    chown system system /sys/bus/i2c/devices/5-0043/calibration/f0_stored
-    chown system system /sys/bus/i2c/devices/4-0043/calibration/f0_stored
-    chown system system /sys/bus/i2c/devices/6-0042/calibration/f0_stored
-    chown system system /sys/bus/i2c/devices/5-0042/calibration/f0_stored
-    chown system system /sys/bus/i2c/devices/4-0042/calibration/f0_stored
-    chown system system /sys/bus/i2c/devices/6-0043/calibration/q_stored
-    chown system system /sys/bus/i2c/devices/5-0043/calibration/q_stored
-    chown system system /sys/bus/i2c/devices/4-0043/calibration/q_stored
-    chown system system /sys/bus/i2c/devices/6-0042/calibration/q_stored
-    chown system system /sys/bus/i2c/devices/5-0042/calibration/q_stored
-    chown system system /sys/bus/i2c/devices/4-0042/calibration/q_stored
-    chown system system /sys/bus/i2c/devices/6-0043/calibration/redc_stored
-    chown system system /sys/bus/i2c/devices/5-0043/calibration/redc_stored
-    chown system system /sys/bus/i2c/devices/4-0043/calibration/redc_stored
-    chown system system /sys/bus/i2c/devices/6-0042/calibration/redc_stored
-    chown system system /sys/bus/i2c/devices/5-0042/calibration/redc_stored
-    chown system system /sys/bus/i2c/devices/4-0042/calibration/redc_stored
-    chown system system /sys/bus/i2c/devices/6-0043/default/vibe_state
-    chown system system /sys/bus/i2c/devices/5-0043/default/vibe_state
-    chown system system /sys/bus/i2c/devices/4-0043/default/vibe_state
-    chown system system /sys/bus/i2c/devices/6-0042/default/vibe_state
-    chown system system /sys/bus/i2c/devices/5-0042/default/vibe_state
-    chown system system /sys/bus/i2c/devices/4-0042/default/vibe_state
-    chown system system /sys/bus/i2c/devices/6-0043/default/num_waves
-    chown system system /sys/bus/i2c/devices/5-0043/default/num_waves
-    chown system system /sys/bus/i2c/devices/4-0043/default/num_waves
-    chown system system /sys/bus/i2c/devices/6-0042/default/num_waves
-    chown system system /sys/bus/i2c/devices/5-0042/default/num_waves
-    chown system system /sys/bus/i2c/devices/4-0042/default/num_waves
-    chown system system /sys/bus/i2c/devices/6-0043/default/f0_offset
-    chown system system /sys/bus/i2c/devices/5-0043/default/f0_offset
-    chown system system /sys/bus/i2c/devices/4-0043/default/f0_offset
-    chown system system /sys/bus/i2c/devices/6-0042/default/f0_offset
-    chown system system /sys/bus/i2c/devices/5-0042/default/f0_offset
-    chown system system /sys/bus/i2c/devices/4-0042/default/f0_offset
-    chown system system /sys/bus/i2c/devices/6-0043/default/owt_free_space
-    chown system system /sys/bus/i2c/devices/5-0043/default/owt_free_space
-    chown system system /sys/bus/i2c/devices/4-0043/default/owt_free_space
-    chown system system /sys/bus/i2c/devices/6-0042/default/owt_free_space
-    chown system system /sys/bus/i2c/devices/5-0042/default/owt_free_space
-    chown system system /sys/bus/i2c/devices/4-0042/default/owt_free_space
-    chown system system /sys/bus/i2c/devices/6-0043/default/f0_comp_enable
-    chown system system /sys/bus/i2c/devices/5-0043/default/f0_comp_enable
-    chown system system /sys/bus/i2c/devices/4-0043/default/f0_comp_enable
-    chown system system /sys/bus/i2c/devices/6-0042/default/f0_comp_enable
-    chown system system /sys/bus/i2c/devices/5-0042/default/f0_comp_enable
-    chown system system /sys/bus/i2c/devices/4-0042/default/f0_comp_enable
-    chown system system /sys/bus/i2c/devices/6-0043/default/redc_comp_enable
-    chown system system /sys/bus/i2c/devices/5-0043/default/redc_comp_enable
-    chown system system /sys/bus/i2c/devices/4-0043/default/redc_comp_enable
-    chown system system /sys/bus/i2c/devices/6-0042/default/redc_comp_enable
-    chown system system /sys/bus/i2c/devices/5-0042/default/redc_comp_enable
-    chown system system /sys/bus/i2c/devices/4-0042/default/redc_comp_enable
-    chown system system /sys/bus/i2c/devices/6-0043/default/delay_before_stop_playback_us
-    chown system system /sys/bus/i2c/devices/5-0043/default/delay_before_stop_playback_us
-    chown system system /sys/bus/i2c/devices/4-0043/default/delay_before_stop_playback_us
-    chown system system /sys/bus/i2c/devices/6-0042/default/delay_before_stop_playback_us
-    chown system system /sys/bus/i2c/devices/5-0042/default/delay_before_stop_playback_us
-    chown system system /sys/bus/i2c/devices/4-0042/default/delay_before_stop_playback_us
+    chown system system /sys/bus/i2c/devices/9-0042/calibration/f0_stored
+    chown system system /sys/bus/i2c/devices/9-0042/calibration/q_stored
+    chown system system /sys/bus/i2c/devices/9-0042/calibration/redc_stored
+    chown system system /sys/bus/i2c/devices/9-0042/default/vibe_state
+    chown system system /sys/bus/i2c/devices/9-0042/default/num_waves
+    chown system system /sys/bus/i2c/devices/9-0042/default/f0_offset
+    chown system system /sys/bus/i2c/devices/9-0042/default/owt_free_space
+    chown system system /sys/bus/i2c/devices/9-0042/default/f0_comp_enable
+    chown system system /sys/bus/i2c/devices/9-0042/default/redc_comp_enable
+    chown system system /sys/bus/i2c/devices/9-0042/default/delay_before_stop_playback_us
 
-    enable vendor.vibrator.cs40l26
     enable vendor.vibrator.cs40l26-dual
diff --git a/conf/init.tokay.rc b/conf/init.tokay.rc
index cd361036..66d64781 100644
--- a/conf/init.tokay.rc
+++ b/conf/init.tokay.rc
@@ -36,44 +36,3 @@ on post-fs-data
 # Bluetooth
 on post-fs-data
     chown bluetooth system /proc/bluetooth/timesync
-
-# Haptics
-on property:vendor.all.modules.ready=1
-    mkdir /mnt/vendor/persist/haptics 0770 system system
-    chmod 770 /mnt/vendor/persist/haptics
-    chmod 440 /mnt/vendor/persist/haptics/cs40l26.cal
-    chown system system /mnt/vendor/persist/haptics
-    chown system system /mnt/vendor/persist/haptics/cs40l26.cal
-
-    chown system system /sys/bus/i2c/devices/6-0043/calibration/f0_stored
-    chown system system /sys/bus/i2c/devices/5-0043/calibration/f0_stored
-    chown system system /sys/bus/i2c/devices/4-0043/calibration/f0_stored
-    chown system system /sys/bus/i2c/devices/6-0043/calibration/q_stored
-    chown system system /sys/bus/i2c/devices/5-0043/calibration/q_stored
-    chown system system /sys/bus/i2c/devices/4-0043/calibration/q_stored
-    chown system system /sys/bus/i2c/devices/6-0043/calibration/redc_stored
-    chown system system /sys/bus/i2c/devices/5-0043/calibration/redc_stored
-    chown system system /sys/bus/i2c/devices/4-0043/calibration/redc_stored
-    chown system system /sys/bus/i2c/devices/6-0043/default/vibe_state
-    chown system system /sys/bus/i2c/devices/5-0043/default/vibe_state
-    chown system system /sys/bus/i2c/devices/4-0043/default/vibe_state
-    chown system system /sys/bus/i2c/devices/6-0043/default/num_waves
-    chown system system /sys/bus/i2c/devices/5-0043/default/num_waves
-    chown system system /sys/bus/i2c/devices/4-0043/default/num_waves
-    chown system system /sys/bus/i2c/devices/6-0043/default/f0_offset
-    chown system system /sys/bus/i2c/devices/5-0043/default/f0_offset
-    chown system system /sys/bus/i2c/devices/4-0043/default/f0_offset
-    chown system system /sys/bus/i2c/devices/6-0043/default/owt_free_space
-    chown system system /sys/bus/i2c/devices/5-0043/default/owt_free_space
-    chown system system /sys/bus/i2c/devices/4-0043/default/owt_free_space
-    chown system system /sys/bus/i2c/devices/6-0043/default/f0_comp_enable
-    chown system system /sys/bus/i2c/devices/5-0043/default/f0_comp_enable
-    chown system system /sys/bus/i2c/devices/4-0043/default/f0_comp_enable
-    chown system system /sys/bus/i2c/devices/6-0043/default/redc_comp_enable
-    chown system system /sys/bus/i2c/devices/5-0043/default/redc_comp_enable
-    chown system system /sys/bus/i2c/devices/4-0043/default/redc_comp_enable
-    chown system system /sys/bus/i2c/devices/6-0043/default/delay_before_stop_playback_us
-    chown system system /sys/bus/i2c/devices/5-0043/default/delay_before_stop_playback_us
-    chown system system /sys/bus/i2c/devices/4-0043/default/delay_before_stop_playback_us
-
-    enable vendor.vibrator.cs40l26