diff --git a/audio/sound_trigger_mixer_paths.xml b/audio/sound_trigger_mixer_paths.xml
deleted file mode 100644
index 7ae3fb1..0000000
--- a/audio/sound_trigger_mixer_paths.xml
+++ /dev/null
@@ -1,336 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--- Copyright (c) 2014-2020, The Linux Foundation. All rights reserved.       -->
-<!---                                                                           -->
-<!--- Redistribution and use in source and binary forms, with or without        -->
-<!--- modification, are permitted provided that the following conditions are    -->
-<!--- met:                                                                      -->
-<!---     * Redistributions of source code must retain the above copyright      -->
-<!---       notice, this list of conditions and the following disclaimer.       -->
-<!---     * Redistributions in binary form must reproduce the above             -->
-<!---       copyright notice, this list of conditions and the following         -->
-<!---       disclaimer in the documentation and/or other materials provided     -->
-<!---       with the distribution.                                              -->
-<!---     * Neither the name of The Linux Foundation nor the names of its       -->
-<!---       contributors may be used to endorse or promote products derived     -->
-<!---       from this software without specific prior written permission.       -->
-<!---                                                                           -->
-<!--- THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED              -->
-<!--- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF      -->
-<!--- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT    -->
-<!--- ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS    -->
-<!--- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR    -->
-<!--- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF      -->
-<!--- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR           -->
-<!--- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,     -->
-<!--- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE      -->
-<!--- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN    -->
-<!--- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.                             -->
-
-<mixer>
-    <!-- These are the initial mixer settings -->
-    <ctl name="LSM1 Mixer VA_CDC_DMA_TX_0" value="0" />
-    <ctl name="LSM2 Mixer VA_CDC_DMA_TX_0" value="0" />
-    <ctl name="LSM3 Mixer VA_CDC_DMA_TX_0" value="0" />
-    <ctl name="LSM4 Mixer VA_CDC_DMA_TX_0" value="0" />
-    <ctl name="LSM5 Mixer VA_CDC_DMA_TX_0" value="0" />
-    <ctl name="LSM6 Mixer VA_CDC_DMA_TX_0" value="0" />
-    <ctl name="LSM7 Mixer VA_CDC_DMA_TX_0" value="0" />
-    <ctl name="LSM8 Mixer VA_CDC_DMA_TX_0" value="0" />
-    <ctl name="LSM1 Port" value="None" />
-    <ctl name="LSM2 Port" value="None" />
-    <ctl name="LSM3 Port" value="None" />
-    <ctl name="LSM4 Port" value="None" />
-    <ctl name="LSM5 Port" value="None" />
-    <ctl name="LSM6 Port" value="None" />
-    <ctl name="LSM7 Port" value="None" />
-    <ctl name="LSM8 Port" value="None" />
-    <ctl name="VA_CDC_DMA_TX_0 Channels" value="One" />
-    <ctl name="VA_AIF1_CAP Mixer DEC0" value="0" />
-    <ctl name="VA_AIF1_CAP Mixer DEC1" value="0" />
-    <ctl name="VA_AIF1_CAP Mixer DEC2" value="0" />
-    <ctl name="VA_AIF1_CAP Mixer DEC3" value="0" />
-    <ctl name="VA_AIF1_CAP Mixer DEC4" value="0" />
-    <ctl name="VA_AIF1_CAP Mixer DEC5" value="0" />
-    <ctl name="VA_AIF1_CAP Mixer DEC6" value="0" />
-    <ctl name="VA_AIF1_CAP Mixer DEC7" value="0" />
-    <ctl name="VA DEC0 MUX" value="MSM_DMIC" />
-    <ctl name="VA DEC1 MUX" value="MSM_DMIC" />
-    <ctl name="VA DEC2 MUX" value="MSM_DMIC" />
-    <ctl name="VA DEC3 MUX" value="MSM_DMIC" />
-    <ctl name="VA DEC4 MUX" value="MSM_DMIC" />
-    <ctl name="VA DEC5 MUX" value="MSM_DMIC" />
-    <ctl name="VA DEC6 MUX" value="MSM_DMIC" />
-    <ctl name="VA DEC7 MUX" value="MSM_DMIC" />
-    <ctl name="VA DMIC MUX0" value="ZERO" />
-    <ctl name="VA DMIC MUX1" value="ZERO" />
-    <ctl name="VA DMIC MUX2" value="ZERO" />
-    <ctl name="VA DMIC MUX3" value="ZERO" />
-    <ctl name="VA DMIC MUX4" value="ZERO" />
-    <ctl name="VA DMIC MUX5" value="ZERO" />
-    <ctl name="VA DMIC MUX6" value="ZERO" />
-    <ctl name="VA DMIC MUX7" value="ZERO" />
-    <ctl name="VA SMIC MUX0" value="ZERO" />
-    <ctl name="VA SMIC MUX1" value="ZERO" />
-    <ctl name="VA SMIC MUX2" value="ZERO" />
-    <ctl name="VA SMIC MUX3" value="ZERO" />
-    <ctl name="VA SMIC MUX4" value="ZERO" />
-    <ctl name="VA SMIC MUX5" value="ZERO" />
-    <ctl name="VA SMIC MUX6" value="ZERO" />
-    <ctl name="VA SMIC MUX7" value="ZERO" />
-    <ctl name="AUDIO_REF_EC_UL1 MUX" value="None"/>
-    <ctl name="EC Reference Channels" value="Zero"/>
-    <ctl name="EC Reference Bit Format" value="0"/>
-    <ctl name="EC Reference SampleRate" value="0"/>
-    <ctl name="ADC2_MIXER Switch" value="0" />
-    <ctl name="LPI Enable" value="0" />
-    <ctl name="ADC2 Volume" value="12" />
-    <ctl name="VA_DEC0 MODE" value="ADC_DEFAULT" />
-    <ctl name="ADC2_BCS Disable" value="0" />
-
-    <path name="listen-voice-wakeup-1">
-        <ctl name="LSM1 Mixer VA_CDC_DMA_TX_0" value="1" />
-    </path>
-
-    <path name="listen-voice-wakeup-2">
-        <ctl name="LSM2 Mixer VA_CDC_DMA_TX_0" value="1" />
-    </path>
-
-    <path name="listen-voice-wakeup-3">
-        <ctl name="LSM3 Mixer VA_CDC_DMA_TX_0" value="1" />
-    </path>
-
-    <path name="listen-voice-wakeup-4">
-        <ctl name="LSM4 Mixer VA_CDC_DMA_TX_0" value="1" />
-    </path>
-
-    <path name="listen-voice-wakeup-5">
-        <ctl name="LSM5 Mixer VA_CDC_DMA_TX_0" value="1" />
-    </path>
-
-    <path name="listen-voice-wakeup-6">
-        <ctl name="LSM6 Mixer VA_CDC_DMA_TX_0" value="1" />
-    </path>
-
-    <path name="listen-voice-wakeup-7">
-        <ctl name="LSM7 Mixer VA_CDC_DMA_TX_0" value="1" />
-    </path>
-
-    <path name="listen-voice-wakeup-8">
-        <ctl name="LSM8 Mixer VA_CDC_DMA_TX_0" value="1" />
-    </path>
-
-    <path name="listen-voice-wakeup-1 preproc">
-        <path name="listen-voice-wakeup-1" />
-    </path>
-
-    <path name="listen-voice-wakeup-2 preproc">
-        <path name="listen-voice-wakeup-2" />
-    </path>
-
-    <path name="listen-voice-wakeup-3 preproc">
-        <path name="listen-voice-wakeup-3" />
-    </path>
-
-    <path name="listen-voice-wakeup-4 preproc">
-        <path name="listen-voice-wakeup-4" />
-    </path>
-
-    <path name="listen-voice-wakeup-5 preproc">
-        <path name="listen-voice-wakeup-5" />
-    </path>
-
-    <path name="listen-voice-wakeup-6 preproc">
-        <path name="listen-voice-wakeup-6" />
-    </path>
-
-    <path name="listen-voice-wakeup-7 preproc">
-        <path name="listen-voice-wakeup-7" />
-    </path>
-
-    <path name="listen-voice-wakeup-8 preproc">
-        <path name="listen-voice-wakeup-8" />
-    </path>
-
-    <path name="listen-voice-wakeup-1 port">
-        <ctl name="LSM1 Port" value="VA_CDC_DMA_TX_0" />
-        <ctl name="LPI Enable" value="1" />
-        <ctl name="ADC2_BCS Disable" value="1" />
-    </path>
-
-    <path name="listen-voice-wakeup-2 port">
-        <ctl name="LSM2 Port" value="VA_CDC_DMA_TX_0" />
-        <ctl name="LPI Enable" value="1" />
-        <ctl name="ADC2_BCS Disable" value="1" />
-    </path>
-
-    <path name="listen-voice-wakeup-3 port">
-        <ctl name="LSM3 Port" value="VA_CDC_DMA_TX_0" />
-        <ctl name="LPI Enable" value="1" />
-        <ctl name="ADC2_BCS Disable" value="1" />
-    </path>
-
-    <path name="listen-voice-wakeup-4 port">
-        <ctl name="LSM4 Port" value="VA_CDC_DMA_TX_0" />
-        <ctl name="LPI Enable" value="1" />
-        <ctl name="ADC2_BCS Disable" value="1" />
-    </path>
-
-    <path name="listen-voice-wakeup-5 port">
-        <ctl name="LSM5 Port" value="VA_CDC_DMA_TX_0" />
-        <ctl name="LPI Enable" value="1" />
-        <ctl name="ADC2_BCS Disable" value="1" />
-    </path>
-
-    <path name="listen-voice-wakeup-6 port">
-        <ctl name="LSM6 Port" value="VA_CDC_DMA_TX_0" />
-        <ctl name="LPI Enable" value="1" />
-        <ctl name="ADC2_BCS Disable" value="1" />
-    </path>
-
-    <path name="listen-voice-wakeup-7 port">
-        <ctl name="LSM7 Port" value="VA_CDC_DMA_TX_0" />
-        <ctl name="LPI Enable" value="1" />
-        <ctl name="ADC2_BCS Disable" value="1" />
-    </path>
-
-    <path name="listen-voice-wakeup-8 port">
-        <ctl name="LSM8 Port" value="VA_CDC_DMA_TX_0" />
-        <ctl name="LPI Enable" value="1" />
-        <ctl name="ADC2_BCS Disable" value="1" />
-    </path>
-
-    <path name="listen-voice-wakeup-1 preproc port">
-        <ctl name="LSM1 Port" value="ADM_LSM_TX" />
-        <ctl name="LPI Enable" value="0" />
-        <ctl name="ADC2_BCS Disable" value="0" />
-    </path>
-
-    <path name="listen-voice-wakeup-2 preproc port">
-        <ctl name="LSM2 Port" value="ADM_LSM_TX" />
-        <ctl name="LPI Enable" value="0" />
-        <ctl name="ADC2_BCS Disable" value="0" />
-    </path>
-
-    <path name="listen-voice-wakeup-3 preproc port">
-        <ctl name="LSM3 Port" value="ADM_LSM_TX" />
-        <ctl name="LPI Enable" value="0" />
-        <ctl name="ADC2_BCS Disable" value="0" />
-    </path>
-
-    <path name="listen-voice-wakeup-4 preproc port">
-        <ctl name="LSM4 Port" value="ADM_LSM_TX" />
-        <ctl name="LPI Enable" value="0" />
-        <ctl name="ADC2_BCS Disable" value="0" />
-    </path>
-
-    <path name="listen-voice-wakeup-5 preproc port">
-        <ctl name="LSM5 Port" value="ADM_LSM_TX" />
-        <ctl name="LPI Enable" value="0" />
-        <ctl name="ADC2_BCS Disable" value="0" />
-    </path>
-
-    <path name="listen-voice-wakeup-6 preproc port">
-        <ctl name="LSM6 Port" value="ADM_LSM_TX" />
-        <ctl name="LPI Enable" value="0" />
-        <ctl name="ADC2_BCS Disable" value="0" />
-    </path>
-
-    <path name="listen-voice-wakeup-7 preproc port">
-        <ctl name="LSM7 Port" value="ADM_LSM_TX" />
-        <ctl name="LPI Enable" value="0" />
-        <ctl name="ADC2_BCS Disable" value="0" />
-    </path>
-
-    <path name="listen-voice-wakeup-8 preproc port">
-        <ctl name="LSM8 Port" value="ADM_LSM_TX" />
-        <ctl name="LPI Enable" value="0" />
-        <ctl name="ADC2_BCS Disable" value="0" />
-    </path>
-
-    <path name="listen-ape-handset-mic">
-        <ctl name="VA_AIF1_CAP Mixer DEC0" value="1" />
-        <ctl name="VA DEC0 MUX" value="SWR_MIC" />
-        <ctl name="VA SMIC MUX0" value="ADC2" />
-        <ctl name="ADC2_MIXER Switch" value="1" />
-        <ctl name="ADC2 MUX" value="INP3" />
-    </path>
-
-    <path name="listen-ape-handset-mic-preproc">
-        <path name="listen-ape-handset-mic" />
-    </path>
-
-    <path name="listen-ape-handset-dmic">
-        <ctl name="VA_CDC_DMA_TX_0 Channels" value="Two" />
-        <ctl name="VA_AIF1_CAP Mixer DEC0" value="1" />
-        <ctl name="VA_AIF1_CAP Mixer DEC1" value="1" />
-        <ctl name="VA DEC0 MUX" value="SWR_MIC" />
-        <ctl name="VA SMIC MUX0" value="ADC0" />
-        <ctl name="ADC1_MIXER Switch" value="1" />
-        <ctl name="VA DEC1 MUX" value="SWR_MIC" />
-        <ctl name="VA SMIC MUX1" value="ADC2" />
-        <ctl name="ADC2_MIXER Switch" value="1" />
-        <ctl name="ADC2 MUX" value="INP3" />
-        <ctl name="VA_DEC0 Volume" value="95" />
-        <ctl name="VA_DEC1 Volume" value="90" />
-    </path>
-
-    <path name="listen-ape-handset-tmic">
-        <ctl name="VA_CDC_DMA_TX_0 Channels" value="Three" />
-        <ctl name="VA_AIF1_CAP Mixer DEC0" value="1" />
-        <ctl name="VA_AIF1_CAP Mixer DEC1" value="1" />
-        <ctl name="VA_AIF1_CAP Mixer DEC2" value="1" />
-        <ctl name="VA DEC0 MUX" value="MSM_DMIC" />
-        <ctl name="VA DEC1 MUX" value="MSM_DMIC" />
-        <ctl name="VA DEC2 MUX" value="MSM_DMIC" />
-        <ctl name="VA DMIC MUX0" value="DMIC1" />
-        <ctl name="VA DMIC MUX1" value="DMIC4" />
-        <ctl name="VA DMIC MUX2" value="DMIC0" />
-    </path>
-
-    <path name="listen-ape-handset-qmic">
-        <ctl name="VA_CDC_DMA_TX_0 Channels" value="Four" />
-        <ctl name="VA_AIF1_CAP Mixer DEC0" value="1" />
-        <ctl name="VA_AIF1_CAP Mixer DEC1" value="1" />
-        <ctl name="VA_AIF1_CAP Mixer DEC2" value="1" />
-        <ctl name="VA_AIF1_CAP Mixer DEC3" value="1" />
-        <ctl name="VA DEC0 MUX" value="MSM_DMIC" />
-        <ctl name="VA DEC1 MUX" value="MSM_DMIC" />
-        <ctl name="VA DEC2 MUX" value="MSM_DMIC" />
-        <ctl name="VA DEC3 MUX" value="MSM_DMIC" />
-        <ctl name="VA DMIC MUX0" value="DMIC0" />
-        <ctl name="VA DMIC MUX1" value="DMIC2" />
-        <ctl name="VA DMIC MUX2" value="DMIC3" />
-        <ctl name="VA DMIC MUX3" value="DMIC1" />
-    </path>
-
-    <path name="listen-ape-headset-mic">
-        <ctl name="VA_AIF1_CAP Mixer DEC0" value="1" />
-        <ctl name="VA DEC0 MUX" value="SWR_MIC" />
-        <ctl name="VA SMIC MUX0" value="ADC1" />
-        <ctl name="ADC2_MIXER Switch" value="1" />
-        <ctl name="ADC2 MUX" value="INP2" />
-        <ctl name="VA_DEC0 MODE" value="ADC_LOW_PWR" />
-    </path>
-
-    <path name="echo-reference">
-        <ctl name="AUDIO_REF_EC_UL1 MUX" value="TERT_MI2S_RX"/>
-        <ctl name="EC Reference Channels" value="One"/>
-        <ctl name="EC Reference Bit Format" value="S16_LE"/>
-        <ctl name="EC Reference SampleRate" value="48000"/>
-    </path>
-
-    <path name="echo-reference headset">
-        <ctl name="AUDIO_REF_EC_UL1 MUX" value="RX_CDC_DMA_RX_0"/>
-        <ctl name="EC Reference Channels" value="One"/>
-        <ctl name="EC Reference Bit Format" value="S16_LE"/>
-        <ctl name="EC Reference SampleRate" value="48000"/>
-    </path>
-
-    <path name="echo-reference a2dp">
-        <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_7_RX"/>
-        <ctl name="EC Reference Channels" value="Two"/>
-        <ctl name="EC Reference Bit Format" value="S16_LE"/>
-        <ctl name="EC Reference SampleRate" value="48000"/>
-    </path>
-
-</mixer>
diff --git a/audio/sound_trigger_platform_info.xml b/audio/sound_trigger_platform_info.xml
deleted file mode 100644
index 317f22b..0000000
--- a/audio/sound_trigger_platform_info.xml
+++ /dev/null
@@ -1,374 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--- Copyright (c) 2013-2020, The Linux Foundation. All rights reserved.       -->
-<!---                                                                           -->
-<!--- Redistribution and use in source and binary forms, with or without        -->
-<!--- modification, are permitted provided that the following conditions are    -->
-<!--- met:                                                                      -->
-<!---     * Redistributions of source code must retain the above copyright      -->
-<!---       notice, this list of conditions and the following disclaimer.       -->
-<!---     * Redistributions in binary form must reproduce the above             -->
-<!---       copyright notice, this list of conditions and the following         -->
-<!---       disclaimer in the documentation and/or other materials provided     -->
-<!---       with the distribution.                                              -->
-<!---     * Neither the name of The Linux Foundation nor the names of its       -->
-<!---       contributors may be used to endorse or promote products derived     -->
-<!---       from this software without specific prior written permission.       -->
-<!---                                                                           -->
-<!--- THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED              -->
-<!--- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF      -->
-<!--- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT    -->
-<!--- ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS    -->
-<!--- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR    -->
-<!--- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF      -->
-<!--- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR           -->
-<!--- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,     -->
-<!--- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE      -->
-<!--- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN    -->
-<!--- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.                             -->
-<sound_trigger_platform_info>
-    <param version="0x0105" /> <!-- this must be the first param -->
-<!--- Version History:                                                          -->
-<!--- 0x0101: Legacy version.                                                   -->
-<!--- 0x0102: Includes acdb_ids param with the gcs_usecase tag. This matches    -->
-<!--- the gcs_usecase with the acdb device that uses it.                        -->
-<!--- 0x0103: app_type and in_channels added to <lsm usecase> and out_channels  -->
-<!--- added to <adm_config>                                                     -->
-<!--- 0x0104: instance id support for both WDSP<CPE> and ADSP lsm usecases      -->
-<!--- 0x0105: Select <lsm_usecase> based on capture device                      -->
-
-    <common_config>
-        <param implementer_version="0x0101" />
-        <param max_ape_sessions="8" />
-        <param enable_failure_detection="false" />
-        <param support_device_switch="false" />
-        <param transit_to_non_lpi_on_battery_charging="false" />
-        <!-- Below backend params must match with port used in mixer path file -->
-        <!-- param used to configure backend sample rate, format and channels -->
-        <param backend_port_name="VA_CDC_DMA_TX_0" />
-        <!-- Param used to match and obtain device backend index -->
-        <param backend_dai_name="VA_CDC_DMA_TX_0" />
-        <!-- Param used to indicate if SVA has dedicated SLIM ports -->
-        <param dedicated_sva_path="false" />
-        <param dedicated_headset_path="false" />
-        <param platform_lpi_enable="true" />
-        <param enable_debug_dumps="false" />
-        <param support_non_lpi_without_ec="false" />
-        <param concurrent_capture="false" />
-    </common_config>
-    <acdb_ids>
-        <param DEVICE_HANDSET_MIC_APE="100" />
-        <param DEVICE_HANDSET_MIC_PP_APE="135" />
-        <param DEVICE_HANDSET_DMIC_APE="149" />
-        <param DEVICE_HANDSET_DMIC_LPI_APE="179" />
-        <param DEVICE_HANDSET_TMIC_APE="157" />
-        <param DEVICE_HANDSET_TMIC_LPI_APE="180" />
-        <param DEVICE_HANDSET_QMIC_APE="137" />
-        <param DEVICE_HANDSET_QMIC_LPI_APE="181" />
-        <param DEVICE_HEADSET_MIC_APE="141" />
-        <param DEVICE_HEADSET_MIC_APE_LPI="182" />
-    </acdb_ids>
-
-    <!-- Multiple sound_model_config tags can be listed, each with unique   -->
-    <!-- vendor_uuid. The below tag represents QTI SVA engine sound model   -->
-    <!-- configuration. ISV must use their own unique vendor_uuid.          -->
-
-    <!-- QTI SVA -->
-    <sound_model_config>
-        <param vendor_uuid="68ab2d40-e860-11e3-95ef-0002a5d5c51b" />
-        <param execution_type="ADSP" />
-        <param merge_first_stage_sound_models="false" />
-        <param max_ape_phrases="20" />
-        <param max_ape_users="10" />
-        <!-- Profile specific data which the algorithm can support -->
-        <param sample_rate="16000" />
-        <param bit_width="16" />
-        <param out_channels="1"/> <!-- Module output channels -->
-        <param dam_token_id="1"/>
-        <arm_ss_usecase>
-            <!-- Options are "KEYWORD_DETECTION", "USER_VERIFICATION", "CUSTOM_DETECTION"  -->
-            <param sm_detection_type= "KEYWORD_DETECTION" />
-            <param sm_id="0x2" />
-            <param module_lib="libcapiv2svacnn.so"/>
-            <param sample_rate="16000"/>
-            <param bit_wdith="16"/>
-            <param channel_count="1"/>
-        </arm_ss_usecase>
-        <arm_ss_usecase>
-            <param sm_detection_type= "USER_VERIFICATION" />
-            <param sm_id="0x4" />
-            <param module_lib="libcapiv2vop.so"/>
-            <param sample_rate="16000"/>
-            <param bit_wdith="16"/>
-            <param channel_count="1"/>
-        </arm_ss_usecase>
-        <arm_ss_usecase>
-            <param sm_detection_type= "KEYWORD_DETECTION" />
-            <param sm_id="0x8" />
-            <param module_lib="libcapiv2svarnn.so"/>
-            <param sample_rate="16000"/>
-            <param bit_wdith="16"/>
-            <param channel_count="1"/>
-        </arm_ss_usecase>
-        <!-- Module and param ids with which the algorithm is integrated
-            in non-graphite firmware (note these must come after gcs params)
-            Extends flexibility to have different ids based on execution type.
-            valid execution_type values: "WDSP" "ADSP" -->
-        <lsm_usecase>
-            <param capture_device="HANDSET" />
-            <!-- adm_cfg_profile should match with the one defined under adm_config -->
-            <!-- Set it to NONE if LSM directly connects to AFE -->
-            <param adm_cfg_profile="FFECNS" />
-            <!-- fluence_type: "FLUENCE_MIC", "FLUENCE_DMIC", "FLUENCE_TMIC"   -->
-            <!-- "FLUENCE_QMIC". Param value is valid when adm_cfg_profile -->
-            <!-- is FFECNS -->
-            <param fluence_type="FLUENCE_MIC" />
-            <param execution_mode="ADSP" />
-            <!-- lpi_mode: "NON_LPI_BARGE_IN", "NON_LPI", "LPI" -->
-            <!-- NON_LPI_BARGE_IN: Default non-LPI mode type. lsm_usecase -->
-            <!-- must be present with this mode type to handle barge-in. -->
-            <!-- NON_LPI: If another lsm_usecase is present with this mode -->
-            <!-- type, it will be used for non-LPI non-barge-in usecases. -->
-            <!-- If not present, NON_LPI_BARGE_IN mode type will be used. -->
-            <!-- LPI: This mode type will be used for LPI usecases. -->
-            <param lpi_mode="NON_LPI_BARGE_IN" />
-            <param app_type="2" /> <!-- app type used in ACDB -->
-            <param in_channels="1"/> <!-- Module input channels -->
-            <param load_sound_model_ids="0x00012C1C, 0x0, 0x00012C14" />
-            <param unload_sound_model_ids="0x00012C1C, 0x0, 0x00012C15" />
-            <param confidence_levels_ids="0x00012C1C, 0x0, 0x00012C07" />
-            <param operation_mode_ids="0x00012C1C, 0x0, 0x00012C02" />
-            <param polling_enable_ids="0x00012C1C, 0x0, 0x00012C1B" />
-            <param custom_config_ids="0x00012C1C, 0x0, 0x00012C20" />
-            <param det_event_type_ids="0x00012C1C, 0x0, 0x00012C2C" />
-            <param lab_dam_cfg_ids="0x00012C08, 0x0, 0x000102C4" />
-        </lsm_usecase>
-        <lsm_usecase>
-            <param capture_device="HANDSET" />
-            <!-- adm_cfg_profile should match with the one defined under adm_config -->
-            <!-- Set it to NONE if LSM directly connects to AFE -->
-            <param adm_cfg_profile="FFECNS" />
-            <!-- fluence_type: "FLUENCE_MIC", "FLUENCE_DMIC", "FLUENCE_TMIC"   -->
-            <!-- "FLUENCE_QMIC". Param value is valid when adm_cfg_profile -->
-            <!-- is FFECNS -->
-            <param fluence_type="FLUENCE_MIC" />
-            <param execution_mode="ADSP" />
-            <!-- lpi_mode: "NON_LPI_BARGE_IN", "NON_LPI", "LPI" -->
-            <!-- NON_LPI_BARGE_IN: Default non-LPI mode type. lsm_usecase -->
-            <!-- must be present with this mode type to handle barge-in. -->
-            <!-- NON_LPI: If another lsm_usecase is present with this mode -->
-            <!-- type, it will be used for non-LPI non-barge-in usecases. -->
-            <!-- If not present, NON_LPI_BARGE_IN mode type will be used. -->
-            <!-- LPI: This mode type will be used for LPI usecases. -->
-            <param lpi_mode="LPI" />
-            <param app_type="2" /> <!-- app type used in ACDB -->
-            <param in_channels="1"/> <!-- Module input channels -->
-            <param load_sound_model_ids="0x00012C1C, 0x0, 0x00012C14" />
-            <param unload_sound_model_ids="0x00012C1C, 0x0, 0x00012C15" />
-            <param confidence_levels_ids="0x00012C1C, 0x0, 0x00012C07" />
-            <param operation_mode_ids="0x00012C1C, 0x0, 0x00012C02" />
-            <param polling_enable_ids="0x00012C1C, 0x0, 0x00012C1B" />
-            <param custom_config_ids="0x00012C1C, 0x0, 0x00012C20" />
-            <param det_event_type_ids="0x00012C1C, 0x0, 0x00012C2C" />
-            <param lab_dam_cfg_ids="0x00012C08, 0x0, 0x000102C4" />
-        </lsm_usecase>
-        <lsm_usecase>
-            <param capture_device="HEADSET" />
-            <param adm_cfg_profile="FFECNS" />
-            <param fluence_type="FLUENCE_MIC" />
-            <param execution_mode="ADSP" />
-            <param app_type="2" /> <!-- app type used in ACDB -->
-            <param in_channels="1"/> <!-- Module input channels -->
-            <param load_sound_model_ids="0x00012C1C, 0x0, 0x00012C14" />
-            <param unload_sound_model_ids="0x00012C1C, 0x0, 0x00012C15" />
-            <param confidence_levels_ids="0x00012C1C, 0x0, 0x00012C07" />
-            <param operation_mode_ids="0x00012C1C, 0x0, 0x00012C02" />
-            <param polling_enable_ids="0x00012C1C, 0x0, 0x00012C1B" />
-            <param custom_config_ids="0x00012C1C, 0x0, 0x00012C20" />
-            <param det_event_type_ids="0x00012C1C, 0x0, 0x00012C2C" />
-            <param lab_dam_cfg_ids="0x00012C08, 0x0, 0x000102C4" />
-        </lsm_usecase>
-
-        <!-- format: "ADPCM_packet" or "PCM_packet" !-->
-        <!-- transfer_mode: "FTRT" or "RT" -->
-        <!--  kw_duration is in milli seconds. It is valid only for FTRT
-            transfer mode -->
-        <param capture_keyword="PCM_packet, RT, 2000" />
-        <param client_capture_read_delay="2000" />
-    </sound_model_config>
-
-    <!-- QTI Music Detection !-->
-    <sound_model_config>
-        <param vendor_uuid="876c1b46-9d4d-40cc-a4fd-4d5ec7a80e47" />
-        <param execution_type="ADSP" />
-        <param max_ape_phrases="1" />
-        <param max_ape_users="1" />
-        <!-- Profile specific data which the algorithm can support -->
-        <param sample_rate="16000" />
-        <param bit_width="16" />
-        <param out_channels="1"/> <!-- Module output channels -->
-        <!-- Module and param ids with which the algorithm is integrated
-            in non-graphite firmware (note these must come after gcs params)
-            Extends flexibility to have different ids based on execution type.
-            valid execution_type values: only "ADSP" -->
-        <lsm_usecase>
-            <param capture_device="HANDSET" />
-            <!-- adm_cfg_profile should match with the one defined under adm_config -->
-            <!-- Set it to NONE if LSM directly connects to AFE -->
-            <param adm_cfg_profile="DEFAULT" />
-            <!-- fluence_type: "FLUENCE_MIC", "FLUENCE_DMIC", "FLUENCE_TMIC"   -->
-            <!-- "FLUENCE_QMIC". Param value is valid when adm_cfg_profile -->
-            <!-- is FFECNS -->
-            <param fluence_type="NONE" />
-            <param execution_mode="ADSP" />
-            <param app_type="4" /> <!-- app type for MD used in ACDB -->
-            <param in_channels="1"/> <!-- Module input channels -->
-            <param load_sound_model_ids="0x00012C22, 0x0, 0x00012C14" />
-            <param unload_sound_model_ids="0x00012C22, 0x0, 0x00012C15" />
-            <param confidence_levels_ids="0x00012C22, 0x0, 0x00012C07" />
-            <param det_event_type_ids="0x00012C22, 0x0, 0x00012C2C" />
-            <param custom_config_ids="0x00012C22, 0x0, 0x00012C30" />
-        </lsm_usecase>
-        <lsm_usecase>
-            <param capture_device="HEADSET" />
-            <param adm_cfg_profile="DEFAULT" />
-            <param fluence_type="NONE" />
-            <param execution_mode="ADSP" />
-            <param app_type="4" /> <!-- app type for MD used in ACDB -->
-            <param in_channels="1"/> <!-- Module input channels -->
-            <param load_sound_model_ids="0x00012C22, 0x0, 0x00012C14" />
-            <param unload_sound_model_ids="0x00012C22, 0x0, 0x00012C15" />
-            <param confidence_levels_ids="0x00012C22, 0x0, 0x00012C07" />
-            <param det_event_type_ids="0x00012C22, 0x0, 0x00012C2C" />
-            <param custom_config_ids="0x00012C22, 0x0, 0x00012C30" />
-        </lsm_usecase>
-
-        <!-- format: "ADPCM_packet" or "PCM_packet" !-->
-        <!-- transfer_mode: "FTRT" or "RT" -->
-        <!--  kw_duration is in milli seconds. It is valid only for FTRT
-            transfer mode -->
-        <param capture_keyword="PCM_packet, FTRT, 1500" />
-        <param client_capture_read_delay="2000" />
-    </sound_model_config>
-
-    <!-- Google Hotword -->
-    <sound_model_config>
-        <param vendor_uuid="7038ddc8-30f2-11e6-b0ac-40a8f03d3f15" />
-        <param execution_type="ADSP" />
-        <param max_ape_phrases="1" />
-        <param max_ape_users="1" />
-        <!-- Profile specific data which the algorithm can support -->
-        <param sample_rate="16000" />
-        <param bit_width="16" />
-        <param out_channels="1"/> <!-- Module output channels -->
-        <lsm_usecase>
-            <param capture_device="HANDSET" />
-            <!-- adm_cfg_profile should match with the one defined under adm_config -->
-            <!-- Set it to NONE if LSM directly connects to AFE -->
-            <param adm_cfg_profile="DEFAULT" />
-            <!-- fluence_type: "FLUENCE_MIC", "FLUENCE_DMIC", "FLUENCE_TMIC"   -->
-            <!-- "FLUENCE_QMIC". Param value is valid when adm_cfg_profile -->
-            <!-- is FFECNS -->
-            <param fluence_type="NONE" />
-            <param execution_mode="ADSP" />
-            <param app_type="3" /> <!-- app type used in ACDB -->
-            <param in_channels="1"/> <!-- Module input channels -->
-            <param load_sound_model_ids="0x18000001, 0x0, 0x00012C14" />
-            <param unload_sound_model_ids="0x18000001, 0x0, 0x00012C15" />
-            <param confidence_levels_ids="0x18000001, 0x0, 0x00012C07" />
-            <param operation_mode_ids="0x18000001, 0x0, 0x00012C02" />
-            <param polling_enable_ids="0x18000001, 0x0, 0x00012C1B" />
-            <param custom_config_ids="0x18000001, 0x0, 0x00012C20" />
-        </lsm_usecase>
-        <lsm_usecase>
-            <param capture_device="HEADSET" />
-            <param adm_cfg_profile="DEFAULT" />
-            <param fluence_type="NONE" />
-            <param execution_mode="ADSP" />
-            <param app_type="3" /> <!-- app type used in ACDB -->
-            <param in_channels="1"/> <!-- Module input channels -->
-            <param load_sound_model_ids="0x18000001, 0x0, 0x00012C14" />
-            <param unload_sound_model_ids="0x18000001, 0x0, 0x00012C15" />
-            <param confidence_levels_ids="0x18000001, 0x0, 0x00012C07" />
-            <param operation_mode_ids="0x18000001, 0x0, 0x00012C02" />
-            <param polling_enable_ids="0x18000001, 0x0, 0x00012C1B" />
-            <param custom_config_ids="0x18000001, 0x0, 0x00012C20" />
-        </lsm_usecase>
-
-        <!-- format: "ADPCM_packet" or "PCM_packet" !-->
-        <!-- transfer_mode: "FTRT" or "RT" -->
-        <!--  kw_duration is in milli seconds. It is valid only for FTRT
-            transfer mode -->
-        <param capture_keyword="PCM_raw, FTRT, 2000" />
-        <param client_capture_read_delay="2000" />
-    </sound_model_config>
-
-    <!-- Google Music Detection -->
-    <sound_model_config>
-        <param vendor_uuid="9f6ad62a-1f0b-11e7-87c5-40a8f03d3f15" />
-        <param execution_type="ADSP" />
-        <param max_ape_phrases="1" />
-        <param max_ape_users="1" />
-        <!-- Profile specific data which the algorithm can support -->
-        <param sample_rate="16000" />
-        <param bit_width="16" />
-        <param out_channels="1"/> <!-- Module output channels -->
-        <lsm_usecase>
-            <param capture_device="HANDSET" />
-            <!-- adm_cfg_profile should match with the one defined under adm_config -->
-            <!-- Set it to NONE if LSM directly connects to AFE -->
-            <param adm_cfg_profile="DEFAULT" />
-            <!-- fluence_type: "FLUENCE_MIC", "FLUENCE_DMIC", "FLUENCE_TMIC"   -->
-            <!-- "FLUENCE_QMIC". Param value is valid when adm_cfg_profile -->
-            <!-- is FFECNS -->
-            <param fluence_type="NONE" />
-            <param execution_mode="ADSP" />
-            <param app_type="3" /> <!-- app type used in ACDB -->
-            <param in_channels="1"/> <!-- Module input channels -->
-            <param load_sound_model_ids="0x18000001, 0x0, 0x00012C14" />
-            <param unload_sound_model_ids="0x18000001, 0x0, 0x00012C15" />
-            <param confidence_levels_ids="0x18000001, 0x0, 0x00012C07" />
-            <param operation_mode_ids="0x18000001, 0x0, 0x00012C02" />
-            <param polling_enable_ids="0x18000001, 0x0, 0x00012C1B" />
-            <param custom_config_ids="0x18000001, 0x0, 0x00012C20" />
-        </lsm_usecase>
-        <lsm_usecase>
-            <param capture_device="HEADSET" />
-            <param adm_cfg_profile="DEFAULT" />
-            <param fluence_type="NONE" />
-            <param execution_mode="ADSP" />
-            <param app_type="3" /> <!-- app type used in ACDB -->
-            <param in_channels="1"/> <!-- Module input channels -->
-            <param load_sound_model_ids="0x18000001, 0x0, 0x00012C14" />
-            <param unload_sound_model_ids="0x18000001, 0x0, 0x00012C15" />
-            <param confidence_levels_ids="0x18000001, 0x0, 0x00012C07" />
-            <param operation_mode_ids="0x18000001, 0x0, 0x00012C02" />
-            <param polling_enable_ids="0x18000001, 0x0, 0x00012C1B" />
-            <param custom_config_ids="0x18000001, 0x0, 0x00012C20" />
-        </lsm_usecase>
-
-        <!-- format: "ADPCM_packet" or "PCM_packet" !-->
-        <!-- transfer_mode: "FTRT" or "RT" -->
-        <!--  kw_duration is in milli seconds. It is valid only for FTRT
-            transfer mode -->
-        <param capture_keyword="PCM_raw, FTRT, 5000" />
-        <param client_capture_read_delay="2000" />
-    </sound_model_config>
-
-    <!-- Multiple adm_config tags can be listed, each with unique profile name. -->
-    <!-- app_type to match corresponding value from ACDB -->
-    <adm_config>
-        <param adm_cfg_profile="FFECNS" />
-        <param app_type="69947" />
-        <param sample_rate="16000" />
-        <param bit_width="16" />
-        <param out_channels="3"/>
-    </adm_config>
-
-    <adm_config>
-        <param adm_cfg_profile="DEFAULT" />
-        <param app_type="69938" />
-        <param sample_rate="16000" />
-        <param bit_width="16" />
-        <param out_channels="1"/>
-    </adm_config>
-</sound_trigger_platform_info>
diff --git a/device.mk b/device.mk
index cae4e1a..cf81cef 100644
--- a/device.mk
+++ b/device.mk
@@ -43,8 +43,7 @@ PRODUCT_PACKAGES += \
     libqcomvoiceprocessing \
     libsndmonitor \
     libspkrprot \
-    libvolumelistener \
-    sound_trigger.primary.atoll:32
+    libvolumelistener
 
 PRODUCT_COPY_FILES += \
      $(call find-copy-subdir-files,*,$(LOCAL_PATH)/audio/,$(TARGET_COPY_OUT_VENDOR)/etc)