diff --git a/prebuilt/common/bin/modelid_cfg.sh b/prebuilt/common/bin/modelid_cfg.sh
index 762b15c6..175dc3dc 100644
--- a/prebuilt/common/bin/modelid_cfg.sh
+++ b/prebuilt/common/bin/modelid_cfg.sh
@@ -48,8 +48,10 @@ if [ $? = 0 ];
 cat /proc/cmdline | egrep -q '(PD9812000)|(PD9814000)'
       if [ $? = 0 ];
          then
+            mv /system/etc/nam/CodecDSPID_MCLK.txt /system/etc
             mv /system/etc/nam/*MCLK.txt /system/etc/soundimage/
-            mv /system/etc/nam/CodecDSPID.txt /system/etc
+            mv /system/etc/nam/AdieHWCodec.csv /system/etc
+            mv /system/etc/nam/AIC3254_REG_DualMic_MCLK.csv /system/etc
             mv /system/etc/nam/gps.conf /system/etc
       fi
     rm -R /system/etc/nam
diff --git a/products/cyanogen_ace.mk b/products/cyanogen_ace.mk
index c43c97e2..bfb826c8 100644
--- a/products/cyanogen_ace.mk
+++ b/products/cyanogen_ace.mk
@@ -28,9 +28,6 @@ PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/ace
 # Add the Torch app
 PRODUCT_PACKAGES += Torch
 
-# Add AicBootFix for ace battery fix
-PRODUCT_PACKAGES += AicBootFix
-
 # Broadcom FM radio
 $(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
 
diff --git a/products/cyanogen_mecha.mk b/products/cyanogen_mecha.mk
index b64f1966..8bbb94a9 100644
--- a/products/cyanogen_mecha.mk
+++ b/products/cyanogen_mecha.mk
@@ -20,9 +20,6 @@ PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/mecha
 # Add the Torch app
 PRODUCT_PACKAGES += Torch
 
-# Add AicBootFix
-PRODUCT_PACKAGES += AicBootFix
-
 # Broadcom FM radio
 $(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
 
diff --git a/products/cyanogen_vivo.mk b/products/cyanogen_vivo.mk
index 812d5feb..25ec9acb 100644
--- a/products/cyanogen_vivo.mk
+++ b/products/cyanogen_vivo.mk
@@ -28,9 +28,6 @@ PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/vivo
 # Add the Torch app
 PRODUCT_PACKAGES += Torch
 
-# Add AicBootFix for vivo battery fix
-PRODUCT_PACKAGES += AicBootFix
-
 # Broadcom FM radio
 $(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
 
diff --git a/products/cyanogen_vivow.mk b/products/cyanogen_vivow.mk
index adb5187c..7d7f8230 100644
--- a/products/cyanogen_vivow.mk
+++ b/products/cyanogen_vivow.mk
@@ -25,9 +25,6 @@ PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/vivow
 # Add the Torch app
 PRODUCT_PACKAGES += Torch
 
-# Add AicBootFix for vivow battery fix
-PRODUCT_PACKAGES += AicBootFix
-
 # Broadcom FM radio
 $(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)