diff --git a/audio/audio_platform_info_extcodec.xml b/audio/audio_platform_info_extcodec.xml
index 117e86e..1ecbb5b 100644
--- a/audio/audio_platform_info_extcodec.xml
+++ b/audio/audio_platform_info_extcodec.xml
@@ -6,10 +6,6 @@
 	<device name="SND_DEVICE_OUT_VOICE_HANDSET" acdb_id="7" />
 	<device name="SND_DEVICE_OUT_VOICE_HANDSET_TMUS" acdb_id="7" />
 	<device name="SND_DEVICE_OUT_HEADPHONES" acdb_id="9" />
-	<device name="SND_DEVICE_OUT_MOD_HEADPHONES" acdb_id="9" />
-	<device name="SND_DEVICE_OUT_MOD_SPKR_MOD_HEADPHONES" acdb_id="9" />
-	<device name="SND_DEVICE_OUT_INT_SPKR_MOD_HEADPHONES" acdb_id="9" />
-	<device name="SND_DEVICE_OUT_MOD_SPKR_INT_HEADPHONES" acdb_id="9" />
 	<device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES" acdb_id="9" />
 	<device name="SND_DEVICE_OUT_SPEAKER_SAFE_AND_HEADPHONES" acdb_id="9" />
 	<device name="SND_DEVICE_OUT_SPEAKER" acdb_id="14" />
@@ -17,25 +13,10 @@
 	<device name="SND_DEVICE_OUT_SPEAKER_REVERSE" acdb_id="14" />
 	<device name="SND_DEVICE_OUT_SPEAKER_SAFE" acdb_id="14" />
 	<device name="SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED" acdb_id="15" />
-	<device name="SND_DEVICE_OUT_INT_SPKR_MOD_HDMI" acdb_id="18" />
-	<device name="SND_DEVICE_OUT_MOD_HDMI" acdb_id="18" />
-	<device name="SND_DEVICE_OUT_MOD_SPKR_INT_HDMI" acdb_id="18" />
-	<device name="SND_DEVICE_OUT_MOD_SPKR_MOD_HDMI" acdb_id="18" />
 	<device name="SND_DEVICE_OUT_SPEAKER_AND_HDMI" acdb_id="18" />
-	<device name="SND_DEVICE_OUT_INT_SPKR_MOD_LINE" acdb_id="77" />
-	<device name="SND_DEVICE_OUT_MOD_SPKR_MOD_LINE" acdb_id="77" />
-	<device name="SND_DEVICE_OUT_MOD_VOICE_LINE" acdb_id="78" />
-	<device name="SND_DEVICE_OUT_MOD_VOICE_LINE_INT_MIC" acdb_id="78" />
 	<device name="SND_DEVICE_OUT_VOICE_LINE" acdb_id="78" />
 	<device name="SND_DEVICE_OUT_VOLTE_NB_ANC_HANDSET" acdb_id="200" />
 	<device name="SND_DEVICE_OUT_VOLTE_NB_HANDSET_TMUS" acdb_id="200" />
-	<device name="SND_DEVICE_OUT_MOD_VOICE_SPEAKER_EXTREF" acdb_id="214" />
-	<device name="SND_DEVICE_OUT_MOD_VOICE_SPEAKER_MODEC" acdb_id="214" />
-	<device name="SND_DEVICE_OUT_MOD_SPEAKER" acdb_id="215" />
-	<device name="SND_DEVICE_OUT_MOD_VOICE_SPEAKER_INTREF" acdb_id="216" />
-	<device name="SND_DEVICE_OUT_MOD_VOLTE_NB_SPEAKER_EXTREF" acdb_id="217" />
-	<device name="SND_DEVICE_OUT_MOD_VOLTE_NB_SPEAKER_MODEC" acdb_id="217" />
-	<device name="SND_DEVICE_OUT_MOD_VOLTE_NB_SPEAKER_INTREF" acdb_id="218" />
 	<device name="SND_DEVICE_OUT_VOLTE_NB_TX" acdb_id="245" />
 
 <!-- Input devices -->
@@ -50,11 +31,8 @@
 	<device name="SND_DEVICE_IN_UNPROCESSED_MIC" acdb_id="11" />
 	<device name="SND_DEVICE_IN_VOICE_REC_DMIC_FLUENCE" acdb_id="35" />
 	<device name="SND_DEVICE_IN_VOICE_DMIC_TMUS" acdb_id="41" />
-	<device name="SND_DEVICE_IN_MOD_VOICE_SPEAKER_INT_MIC" acdb_id="43" />
 	<device name="SND_DEVICE_IN_UNPROCESSED_STEREO_MIC" acdb_id="43" />
 	<device name="SND_DEVICE_IN_HEADSET_MIC_AEC" acdb_id="47" />
-	<device name="SND_DEVICE_IN_MOD_HEADSET_MIC_AEC" acdb_id="47" />
-	<device name="SND_DEVICE_IN_MOD_CAMCORDER" acdb_id="50" />
 	<device name="SND_DEVICE_IN_VOICE_REC_MIC_AEC" acdb_id="62" />
 	<device name="SND_DEVICE_IN_VOICE_REC_MIC_NS" acdb_id="62" />
 	<device name="SND_DEVICE_IN_HANDSET_DMIC_AEC" acdb_id="111" />
@@ -63,14 +41,6 @@
 	<device name="SND_DEVICE_IN_SPEAKER_DMIC_NS" acdb_id="117" />
 	<device name="SND_DEVICE_IN_QUAD_MIC" acdb_id="125" />
 	<device name="SND_DEVICE_IN_THREE_MIC" acdb_id="125" />
-	<device name="SND_DEVICE_IN_MOD_VOICE_MIC" acdb_id="211" />
-	<device name="SND_DEVICE_IN_MOD_SPEAKER_INT_MIC_AEC_EXTREF" acdb_id="224" />
-	<device name="SND_DEVICE_IN_MOD_SPEAKER_INT_MIC_AEC_NS_EXTREF" acdb_id="224" />
-	<device name="SND_DEVICE_IN_MOD_SPEAKER_INT_MIC_AEC_INTREF" acdb_id="225" />
-	<device name="SND_DEVICE_IN_MOD_SPEAKER_INT_MIC_AEC_NS_INTREF" acdb_id="225" />
-	<device name="SND_DEVICE_IN_MOD_MIC_AEC" acdb_id="226" />
-	<device name="SND_DEVICE_IN_MOD_MIC_AEC_NS" acdb_id="226" />
-	<device name="SND_DEVICE_IN_MOD_MIC_NS" acdb_id="226" />
 </acdb_ids>
 
 <pcm_ids>
diff --git a/rootdir/etc/init.mmi.rc b/rootdir/etc/init.mmi.rc
index cdef8cd..5047ac4 100644
--- a/rootdir/etc/init.mmi.rc
+++ b/rootdir/etc/init.mmi.rc
@@ -86,14 +86,6 @@ on post-fs-data
     chown oem_5001 oem_5001 /sys/class/power_supply/battery/device/force_chg_fail_clear
     chown oem_5001 oem_5001 /sys/class/power_supply/battery/device/force_chg_usb_otg_ctl
 
-    chown root oem_5020 /sys/module/qpnp_smbcharger_mmi/parameters/eb_rechrg_start_soc
-    chown root oem_5020 /sys/module/qpnp_smbcharger_mmi/parameters/eb_rechrg_stop_soc
-    chown root oem_5020 /sys/module/qpnp_smbcharger_mmi/parameters/eb_attach_start_soc
-    chown root oem_5020 /sys/module/qpnp_smbcharger_mmi/parameters/eb_attach_stop_soc
-    chown root oem_5020 /sys/module/qpnp_smbcharger_mmi/parameters/eb_low_start_soc
-    chown root oem_5020 /sys/module/qpnp_smbcharger_mmi/parameters/eb_low_stop_soc
-    chown root oem_5020 /sys/module/qpnp_smbcharger_mmi/parameters/eb_on_sw
-
     chmod 0664 /sys/module/qpnp_smbcharger_mmi/parameters/eb_rechrg_start_soc
     chmod 0664 /sys/module/qpnp_smbcharger_mmi/parameters/eb_rechrg_stop_soc
     chmod 0664 /sys/module/qpnp_smbcharger_mmi/parameters/eb_attach_start_soc
@@ -102,9 +94,6 @@ on post-fs-data
     chmod 0664 /sys/module/qpnp_smbcharger_mmi/parameters/eb_low_stop_soc
     chmod 0664 /sys/module/qpnp_smbcharger_mmi/parameters/eb_on_sw
 
-    chown root oem_5020 /sys/class/power_supply/usb/usb_priority
-    chmod 0660 /sys/class/power_supply/usb/usb_priority
-
     # Sensor Hub calibration data directory
     mkdir /data/misc/sensorhub 0770 system compass
 
@@ -121,9 +110,6 @@ on post-fs-data
     mkdir /data/wapi_certificate 0750 system wifi
     chown system wifi /data/wapi_certificate
 
-    # Create greybus firmware folder
-    mkdir /data/gbfirmware 0770 oem_5020 oem_5020
-
     # Create bug2go folder
     mkdir /data/bug2go 0770 log log
 
diff --git a/rootdir/etc/ueventd.qcom.rc b/rootdir/etc/ueventd.qcom.rc
index 76b0bfe..d12ea6e 100644
--- a/rootdir/etc/ueventd.qcom.rc
+++ b/rootdir/etc/ueventd.qcom.rc
@@ -293,51 +293,6 @@
 /dev/hidraw0              0660   root       oem_5004
 /dev/hidraw1              0660   root       oem_5004
 
-# MOD device
-/sys/devices/soc/75b5000.i2c/i2c-7/7-0072 irq_enable 0660 oem_5004 oem_5004
-/sys/devices/soc/0.apba_ctrl apba_enable 0660 oem_5004 oem_5020
-/sys/devices/soc/0.apba_ctrl apba_mode 0660 oem_5004 oem_5020
-/sys/devices/soc/0.apba_ctrl flash_partition 0220 oem_5004 oem_5020
-/sys/devices/soc/0.apba_ctrl unipro_mid 0440 root oem_5020
-/sys/devices/soc/0.apba_ctrl unipro_pid 0440 root oem_5020
-/sys/devices/soc/0.apba_ctrl vid 0440 root oem_5020
-/sys/devices/soc/0.apba_ctrl pid 0440 root oem_5020
-/sys/devices/soc/0.apba_ctrl fw_version 0440 root oem_5020
-/sys/devices/soc/0.apba_ctrl fw_version_str 0440 root oem_5020
-/sys/devices/soc/soc:muc_svc@0/mods_interfaces/* hotplug 0660 root oem_5020
-/sys/devices/soc/soc:muc_svc@0/mods_interfaces/* uevent 0660 root oem_5020
-/sys/devices/soc/soc:muc_svc@0/mods_interfaces/* current_limit 0220 root oem_5020
-/sys/devices/soc/soc:muc_svc@0/mods_interfaces/* rtc_sync 0220 root oem_5020
-/sys/devices/soc/soc:muc_svc@0 flashmode 0660 root oem_5020
-/sys/devices/soc/soc:muc_svc@0 reset 0660 root oem_5020
-/sys/devices/soc/0.muc/0.muc:muc_svc@0/mods_interfaces/* hotplug 0660 root oem_5020
-/sys/devices/soc/0.muc/0.muc:muc_svc@0/mods_interfaces/* uevent 0660 root oem_5020
-/sys/devices/soc/0.muc/0.muc:muc_svc@0 flashmode 0660 root oem_5020
-/sys/devices/platform/mods_ap uevent 0660 root oem_5020
-/sys/devices/platform/mods_ap/* uevent 0660 root oem_5020
-/sys/devices/platform/mods_ap/greybus1 uevent 0664 root oem_5020
-
-# MOD display device
-/sys/devices/platform/mods_ap/greybus1/*/*/display/display* state 0660 root oem_5020
-/sys/devices/platform/mods_ap/greybus1/*/*/display/display* config 0444 root oem_5020
-/sys/devices/platform/mods_ap/greybus1/*/*/display/display* notification 0660 root oem_5020
-
-# MOD light device
-/sys/devices/platform/mods_ap/greybus1/*/*/leds/mod_light*::backlight brightness 0660 root oem_5020
-
-# RAW device
-/dev/gbraw*             0660   root   oem_5020
-# Audio device
-/sys/devices/platform/mods_codec.0 uevent 0660 root oem_5020
-/sys/devices/platform/mods_codec.0/* uevent 0660 root oem_5020
-
-# MOD camera device
-/dev/mot_camera_ext*               0660   system     camera
-/sys/devices/virtual/video4linux/mot_camera_ext* open_mode 0660 system camera
-/sys/devices/virtual/video4linux/mot_camera_ext* uevent 0660 root oem_5020
-/sys/devices/virtual/video4linux/video* open_mode 0660 system camera
-/sys/devices/virtual/video4linux/video* uevent 0660 root oem_5020
-
 # Laser device
 /dev/laser                0660   system     camera