diff --git a/sdm660-common/Android.bp b/sdm660-common/Android.bp
index 4924181..b078ac7 100644
--- a/sdm660-common/Android.bp
+++ b/sdm660-common/Android.bp
@@ -42,17 +42,6 @@ cc_prebuilt_library_shared {
 	soc_specific: true,
 }
 
-android_app_import {
-	name: "WfdService",
-	owner: "asus",
-	apk: "proprietary/priv-app/WfdService/WfdService.apk",
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	privileged: true,
-}
-
 android_app_import {
 	name: "CACertService",
 	owner: "asus",
@@ -409,12 +398,6 @@ android_app_import {
 	system_ext_specific: true,
 }
 
-dex_import {
-	name: "WfdCommon",
-	owner: "asus",
-	jars: ["proprietary/framework/WfdCommon.jar"],
-}
-
 dex_import {
 	name: "tcmclient",
 	owner: "asus",
diff --git a/sdm660-common/proprietary/bin/wfdservice b/sdm660-common/proprietary/bin/wfdservice
deleted file mode 100755
index 4a8b554..0000000
Binary files a/sdm660-common/proprietary/bin/wfdservice and /dev/null differ
diff --git a/sdm660-common/proprietary/etc/init/wfdservice.rc b/sdm660-common/proprietary/etc/init/wfdservice.rc
deleted file mode 100644
index c4d9c77..0000000
--- a/sdm660-common/proprietary/etc/init/wfdservice.rc
+++ /dev/null
@@ -1,14 +0,0 @@
-service wfdservice /system/bin/wfdservice
-    class main
-    user system
-    group audio camera inet uhid drmrpc media_rw media input net_admin
-    #removed these because of limit of 12 groups
-    #graphics net_bt net_bt_admin bluetooth
-    disabled
-    oneshot
-
-on property:vendor.wfdservice=enable
-    start wfdservice
-
-on property:vendor.wfdservice=disable
-    stop wfdservice
diff --git a/sdm660-common/proprietary/etc/wfdconfig.xml b/sdm660-common/proprietary/etc/wfdconfig.xml
deleted file mode 100644
index 88e3cf1..0000000
--- a/sdm660-common/proprietary/etc/wfdconfig.xml
+++ /dev/null
@@ -1,749 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-    <!--
-        Copyright (C) 2012 - 2019 Qualcomm Technologies, Inc.
-        All Rights Reserved.
-        Confidential and Proprietary - Qualcomm Technologies, Inc.
-    -->
-<WFDConfig>
-    <Capability>
-        <!--
-            Audio capabilities
-        -->
-        <AudioLPCM>
-            <Name>LPCM</Name>
-            <Valid>1</Valid>
-            <Channels>2</Channels>
-            <SamplingFreq>48000</SamplingFreq>
-            <Latency>33</Latency>
-        </AudioLPCM>
-
-        <AudioAAC>
-            <Name>AAC</Name>
-            <Valid>1</Valid>
-            <Channels>6</Channels>
-            <SamplingFreq>48000</SamplingFreq>
-            <Latency>0</Latency>
-        </AudioAAC>
-
-        <AudioAC3>
-            <Name>AC3</Name>
-            <Valid>0</Valid>
-            <Channels>0</Channels>
-            <SamplingFreq>0</SamplingFreq>
-            <Latency>0</Latency>
-        </AudioAC3>
-
-        <!--
-            Video extended capabilities for H264 codec
-        -->
-        <VideoFormats>
-
-        <VideoCodecHeader>
-        <TotalProfiles>3</TotalProfiles>
-        <PreferredDisplaySupport>0</PreferredDisplaySupport>
-        </VideoCodecHeader>
-             <!-- AVC Profile 0 - Constrained Baseline,
-                              1 - Constrained High,
-                              2 - Constrained High2,
-                              3 - BaseLine
-                              4 - Main
-                              5 - High
-                  HEVC Profile 0 - Main
-            -->
-
-            <!-- Level  0 - 3.1,
-                        1 - 3.2,
-                        2 - 4.0,
-                        3 - 4.1,
-                        4 - 4.2,
-                        5 - 5,
-                        6 - 5.1,
-                        7 - 5.2
-            -->
-
-            <VideoCodec1>
-                <CodecName>H.264</CodecName>
-                <Profile>0</Profile>
-                <Level>6</Level>
-                <HorizontalResolution>3840</HorizontalResolution>
-                <VerticalResolution>2160</VerticalResolution>
-                <Latency>0</Latency>
-                <MinimumSliceSize>0</MinimumSliceSize>
-                <SliceEncodingParams>0</SliceEncodingParams>
-                <FrameRateControlSupp>1</FrameRateControlSupp>
-                <VideoFps>30</VideoFps>
-                <TranscodingMode>1</TranscodingMode>
-                <NonTranscodingMode>1</NonTranscodingMode>
-            </VideoCodec1>
-
-            <VideoCodec2>
-                <CodecName>H.264</CodecName>
-                <Profile>1</Profile>
-                <Level>6</Level>
-                <HorizontalResolution>3840</HorizontalResolution>
-                <VerticalResolution>2160</VerticalResolution>
-                <Latency>0</Latency>
-                <MinimumSliceSize>0</MinimumSliceSize>
-                <SliceEncodingParams>0</SliceEncodingParams>
-                <FrameRateControlSupp>1</FrameRateControlSupp>
-                <VideoFps>30</VideoFps>
-                <TranscodingMode>1</TranscodingMode>
-                <NonTranscodingMode>1</NonTranscodingMode>
-            </VideoCodec2>
-
-            <VideoCodec3>
-                <CodecName>H.265</CodecName>
-                <Profile>0</Profile>
-                <Level>6</Level>
-                <HorizontalResolution>3840</HorizontalResolution>
-                <VerticalResolution>2160</VerticalResolution>
-                <Latency>0</Latency>
-                <MinimumSliceSize>0</MinimumSliceSize>
-                <SliceEncodingParams>0</SliceEncodingParams>
-                <FrameRateControlSupp>1</FrameRateControlSupp>
-                <VideoFps>30</VideoFps>
-                <TranscodingMode>1</TranscodingMode>
-                <NonTranscodingMode>1</NonTranscodingMode>
-            </VideoCodec3>
-        </VideoFormats>
-
-      <!--
-          Aux streaming addition added for Direct streaming
-        -->
-        <AuxStreamInfo>
-            <Codec>
-            <Count>1</Count>
-            <Name1>PNG</Name1>
-            </Codec>
-
-            <!--
-                Limiting the number of layers to 5 in the overlay
-                Resolution is 720P
-            -->
-            <MaxOverlay>5</MaxOverlay>
-            <HRes>1280</HRes>
-            <VRes>720</VRes>
-            <Mode>CEA</Mode>
-        </AuxStreamInfo>
-
-        <!--
-            Standby Resume capability is supported
-        -->
-        <StandbyResumeCapability>
-            <Valid>1</Valid>
-        </StandbyResumeCapability>
-
-        <!--
-            Explicit AV format change
-            Not supported
-        -->
-        <AVFormatChange>
-            <Valid>0</Valid>
-            <AVInterval>0</AVInterval>
-        </AVFormatChange>
-
-        <!--
-            Frame skipping interval is in the scale of 500 msec or half second.
-            FrameInterval can be between 1 to 7,  according to the WFD spec.
-            0 means Frame skipping interval is infinite and recommended value is 0
-        -->
-        <FrameSkipping>
-            <Valid>1</Valid>
-            <FrameInterval>0</FrameInterval>
-        </FrameSkipping>
-
-        <!--  disable HDCP by default -->
-        <ContentProtection>
-            <Valid>0</Valid>
-            <!--
-                Valid values WFD_HDCP_2_0,
-                WFD_HDCP_2_1 and WFD_HDCP_2_2
-            -->
-            <Version>WFD_HDCP_2_2</Version>
-            <CPPort>6789</CPPort>
-            <!--
-                turn on/off audio encryption
-            -->
-            <EncryptAudio>0</EncryptAudio>
-        </ContentProtection>
-
-        <!--
-            To enable RTP dump at source
-        -->
-        <RTPDumpEnable>
-            <!-- DEPRECATED -->
-            <!-- For enabling RTP encoder dumping set
-                 persist.vendor.debug.rtp.enable_dump to 1
-                 /data/media/dump.ts
-            -->
-        </RTPDumpEnable>
-
-        <!--
-            UIBC settings
-        -->
-        <UIBC>
-            <UIBCValid>1</UIBCValid>                <!-- UIBC by default enabled -->
-            <M4Enable>1</M4Enable>                  <!-- 0/1 send UIBC enable in M4 or not -->
-            <M14Support>0</M14Support>              <!-- 0/1 M14 supported or not -->
-            <InputCategory>
-                <Generic>1</Generic>                <!-- 0/1 - support generic or not -->
-                <HID>1</HID>                        <!-- 0/1 - support HID or not -->
-            </InputCategory>
-
-            <!--  Supported input events  -->
-            <InputEvents>
-                <GenericInputEvents>
-                    <!-- 0/1 for all Input Event Types -->
-                    <Mouse>1</Mouse>
-                    <Keyboard>1</Keyboard>
-                    <SingleTouch>1</SingleTouch>
-                    <MultiTouch>1</MultiTouch>
-                    <JoyStick>0</JoyStick>
-                    <Camera>0</Camera>
-                    <Gesture>0</Gesture>
-                    <RemoteControl>0</RemoteControl>
-                </GenericInputEvents>
-                <!--
-                    Each input path will have a byte and support
-                    for the input types is indicated by setting a bit:
-                    KEYBOARD              BIT0
-                    MOUSE                 BIT1
-                    SINGLETOUCH           BIT2
-                    MULTITOUCH            BIT3
-                    JOYSTICK              BIT4
-                    UIBC_CAMERA           BIT5
-                    GESTURE               BIT6
-                    REMOTECONTROL         BIT7
-                -->
-                <HIDInputPaths>
-                    <Infrared>0</Infrared>
-                    <USB>3</USB>
-                    <BT>0</BT>
-                    <Zigbee>0</Zigbee>
-                    <Wifi>0</Wifi>
-                    <NoSP>0</NoSP>
-                </HIDInputPaths>
-            </InputEvents>
-            <!--  TCP port on which UIBC connection established -->
-            <TcpPort>4321</TcpPort>
-        </UIBC>
-
-    </Capability>
-
-    <!--
-        Enabling Rtcp
-    -->
-    <RTCP>
-        <RtcpRRNotificationEnabled>1</RtcpRRNotificationEnabled>
-    </RTCP>
-
-    <!--
-        Dynamic bitrate adaptation is supported based on link speed
-        Based on the available link speed change video bitrate dynamically
-    -->
-    <DynamicBitrateAdaptation>1</DynamicBitrateAdaptation>
-
-    <!--
-        Send keep alive messages for every 50sec
-    -->
-    <SendKeepAlive>1</SendKeepAlive>
-
-    <!--
-        RTSP port on which RTSP server is running
-    -->
-    <RTSPPort>5550</RTSPPort>
-
-    <!--
-        To configure video core in SVS mode
-    -->
-    <PerformanceLevelSVSMode>0</PerformanceLevelSVSMode>
-    <!--
-        To configure video core in Nominal mode
-    -->
-    <PerformanceLevelNominalMode>0</PerformanceLevelNominalMode>
-    <!--
-        To configure video core in Turbo mode
-    -->
-    <PerformanceLevelTurboMode>0</PerformanceLevelTurboMode>
-
-    <!--
-        To configure minqp value
-    -->
-    <MinQPValue>22</MinQPValue>
-
-    <!--
-        To configure maxqp value
-    -->
-    <MaxQPValue>44</MaxQPValue>
-
-    <!--
-        Bitrate settings for each mode
-    -->
-    <BitrateTable>
-        <!--
-            Bitrate table for Audio formats
-        -->
-        <AAC>
-        <!--
-            Bitrate table for AAC
-        -->
-            <BIT0>
-                <MaxBitrate>256000</MaxBitrate>
-                <MinBitrate>256000</MinBitrate>
-            </BIT0>
-            <BIT1>
-                <MaxBitrate>384000</MaxBitrate>
-                <MinBitrate>384000</MinBitrate>
-            </BIT1>
-            <BIT2>
-                <MaxBitrate>512000</MaxBitrate>
-                <MinBitrate>512000</MinBitrate>
-            </BIT2>
-        </AAC>
-
-        <!--
-            CEA Min and Max bit rates for each resolution
-            Will configure the video core with MaxBitrate
-            Based on the available link speed video bitrate
-            can go upto MinBitrate
-        -->
-        <CEA>
-          <!-- 640x480p60  -->
-            <BIT0>
-                <MinBitrate>1000000</MinBitrate>
-                <MaxBitrate>4000000</MaxBitrate>
-            </BIT0>
-          <!-- 720x480p60 -->
-            <BIT1>
-                <MinBitrate>1000000</MinBitrate>
-                <MaxBitrate>4000000</MaxBitrate>
-            </BIT1>
-          <!-- 720x480i60 -->
-            <BIT2>
-                <MinBitrate>1000000</MinBitrate>
-                <MaxBitrate>4000000</MaxBitrate>
-            </BIT2>
-          <!-- 720x576p50  -->
-            <BIT3>
-                <MinBitrate>1000000</MinBitrate>
-                <MaxBitrate>4000000</MaxBitrate>
-            </BIT3>
-          <!-- 720x576i50  -->
-            <BIT4>
-                <MinBitrate>1000000</MinBitrate>
-                <MaxBitrate>4000000</MaxBitrate>
-            </BIT4>
-          <!-- 1280x720p30  -->
-            <BIT5>
-                <MinBitrate>2500000</MinBitrate>
-                <MaxBitrate>10000000</MaxBitrate>
-            </BIT5>
-          <!-- 1280x720p60  -->
-            <BIT6>
-                <MinBitrate>5000000</MinBitrate>
-                <MaxBitrate>15000000</MaxBitrate>
-            </BIT6>
-          <!-- 1920x1080p30  -->
-            <BIT7>
-                <MinBitrate>5000000</MinBitrate>
-                <MaxBitrate>10000000</MaxBitrate>
-            </BIT7>
-          <!-- 1920x1080p60  -->
-            <BIT8>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>20000000</MaxBitrate>
-            </BIT8>
-          <!-- 1920x1080i60  -->
-            <BIT9>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>20000000</MaxBitrate>
-            </BIT9>
-          <!-- 1280x720p25  -->
-            <BIT10>
-                <MinBitrate>5000000</MinBitrate>
-                <MaxBitrate>10000000</MaxBitrate>
-            </BIT10>
-          <!-- 1280x720p50  -->
-            <BIT11>
-                <MinBitrate>5000000</MinBitrate>
-                <MaxBitrate>20000000</MaxBitrate>
-            </BIT11>
-          <!-- 1920x1080p25  -->
-            <BIT12>
-                <MinBitrate>5000000</MinBitrate>
-                <MaxBitrate>20000000</MaxBitrate>
-            </BIT12>
-          <!-- 1920x1080p50  -->
-            <BIT13>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>20000000</MaxBitrate>
-            </BIT13>
-          <!-- 1920x1080i50  -->
-            <BIT14>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>20000000</MaxBitrate>
-            </BIT14>
-          <!-- 1280x720p24  -->
-            <BIT15>
-                <MinBitrate>2500000</MinBitrate>
-                <MaxBitrate>10000000</MaxBitrate>
-            </BIT15>
-          <!-- 1920x1080p24  -->
-            <BIT16>
-                <MinBitrate>5000000</MinBitrate>
-                <MaxBitrate>10000000</MaxBitrate>
-            </BIT16>
-          <!--  3840x2160p24  -->
-            <BIT17>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>15000000</MaxBitrate>
-            </BIT17>
-          <!--  3840x2160 p25  -->
-            <BIT18>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>15000000</MaxBitrate>
-            </BIT18>
-          <!--  3840x2160p30 -->
-            <BIT19>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>15000000</MaxBitrate>
-            </BIT19>
-          <!--  3840x2160p50  -->
-            <BIT20>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>30000000</MaxBitrate>
-            </BIT20>
-          <!--  3840x2160p60 -->
-            <BIT21>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>30000000</MaxBitrate>
-            </BIT21>
-          <!--  4096x2160p24  -->
-            <BIT22>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>15000000</MaxBitrate>
-            </BIT22>
-          <!--  4096x2160p25  -->
-            <BIT23>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>15000000</MaxBitrate>
-            </BIT23>
-          <!--  4096x2160p30  -->
-            <BIT24>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>15000000</MaxBitrate>
-            </BIT24>
-          <!--  4096x2160p50  -->
-            <BIT25>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>30000000</MaxBitrate>
-            </BIT25>
-          <!--  4096x2160 p60 -->
-            <BIT26>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>30000000</MaxBitrate>
-            </BIT26>
-        </CEA>
-
-        <!--
-            VESA Min and Max bit rates for each resolution
-            Will configure the video core with MaxBitrate
-            Based on the available link speed video bitrate
-            can go upto MinBitrate
-        -->
-        <VESA>
-          <!--  800x600p30 -->
-            <BIT0>
-                <MinBitrate>500000</MinBitrate>
-                <MaxBitrate>2000000</MaxBitrate>
-            </BIT0>
-          <!--  800x600p60 -->
-            <BIT1>
-                <MinBitrate>1000000</MinBitrate>
-                <MaxBitrate>5000000</MaxBitrate>
-            </BIT1>
-          <!--  1024x768p30 -->
-            <BIT2>
-                <MinBitrate>2500000</MinBitrate>
-                <MaxBitrate>10000000</MaxBitrate>
-            </BIT2>
-          <!--  1024x768p60 -->
-            <BIT3>
-                <MinBitrate>2500000</MinBitrate>
-                <MaxBitrate>10000000</MaxBitrate>
-            </BIT3>
-          <!--  1152x864p30 -->
-            <BIT4>
-                <MinBitrate>2500000</MinBitrate>
-                <MaxBitrate>10000000</MaxBitrate>
-            </BIT4>
-          <!--  1152x864p60 -->
-            <BIT5>
-                <MinBitrate>5000000</MinBitrate>
-                <MaxBitrate>15000000</MaxBitrate>
-            </BIT5>
-          <!--  1280x768p30 -->
-            <BIT6>
-                <MinBitrate>2500000</MinBitrate>
-                <MaxBitrate>10000000</MaxBitrate>
-            </BIT6>
-          <!--  1280x768p60 -->
-            <BIT7>
-                <MinBitrate>5000000</MinBitrate>
-                <MaxBitrate>20000000</MaxBitrate>
-            </BIT7>
-          <!--  1280x800p30 -->
-            <BIT8>
-                <MinBitrate>3500000</MinBitrate>
-                <MaxBitrate>10000000</MaxBitrate>
-            </BIT8>
-          <!--  1280x800p60 -->
-            <BIT9>
-                <MinBitrate>5000000</MinBitrate>
-                <MaxBitrate>15000000</MaxBitrate>
-            </BIT9>
-          <!--  1360x768p30 -->
-            <BIT10>
-                <MinBitrate>3500000</MinBitrate>
-                <MaxBitrate>10000000</MaxBitrate>
-            </BIT10>
-          <!--  1360x768p60 -->
-            <BIT11>
-                <MinBitrate>5000000</MinBitrate>
-                <MaxBitrate>15000000</MaxBitrate>
-            </BIT11>
-          <!--  1366x768p30 -->
-            <BIT12>
-                <MinBitrate>2500000</MinBitrate>
-                <MaxBitrate>10000000</MaxBitrate>
-            </BIT12>
-          <!--  1366x768p60 -->
-            <BIT13>
-                <MinBitrate>5000000</MinBitrate>
-                <MaxBitrate>10000000</MaxBitrate>
-            </BIT13>
-          <!--  1280x1024p30 -->
-            <BIT14>
-                <MinBitrate>5000000</MinBitrate>
-                <MaxBitrate>10000000</MaxBitrate>
-            </BIT14>
-          <!--  1280x1024p60 -->
-            <BIT15>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>20000000</MaxBitrate>
-            </BIT15>
-          <!--  1400x1050p30 -->
-            <BIT16>
-                <MinBitrate>5000000</MinBitrate>
-                <MaxBitrate>10000000</MaxBitrate>
-            </BIT16>
-          <!--  1400x1050p60 -->
-            <BIT17>
-                <MinBitrate>5000000</MinBitrate>
-                <MaxBitrate>20000000</MaxBitrate>
-            </BIT17>
-          <!--  1440x900p30 -->
-            <BIT18>
-                <MinBitrate>5000000</MinBitrate>
-                <MaxBitrate>10000000</MaxBitrate>
-            </BIT18>
-          <!--  1440x900p60 -->
-            <BIT19>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>20000000</MaxBitrate>
-            </BIT19>
-          <!--  1600x900p30 -->
-            <BIT20>
-                <MinBitrate>5000000</MinBitrate>
-                <MaxBitrate>10000000</MaxBitrate>
-            </BIT20>
-          <!--  1600x900p60 -->
-            <BIT21>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>20000000</MaxBitrate>
-            </BIT21>
-          <!--  1600x1200p30 -->
-            <BIT22>
-                <MinBitrate>5000000</MinBitrate>
-                <MaxBitrate>10000000</MaxBitrate>
-            </BIT22>
-          <!--  1600x1200p60 -->
-            <BIT23>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>20000000</MaxBitrate>
-            </BIT23>
-          <!--  1680x1024p30 -->
-            <BIT24>
-                <MinBitrate>5000000</MinBitrate>
-                <MaxBitrate>10000000</MaxBitrate>
-            </BIT24>
-          <!--  1680x1024p60 -->
-            <BIT25>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>20000000</MaxBitrate>
-            </BIT25>
-          <!--  1680x1050p30 -->
-            <BIT26>
-                <MinBitrate>5000000</MinBitrate>
-                <MaxBitrate>10000000</MaxBitrate>
-            </BIT26>
-          <!--  1680x1050p60 -->
-            <BIT27>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>20000000</MaxBitrate>
-            </BIT27>
-          <!--  1920x1200p30 -->
-            <BIT28>
-                <MinBitrate>5000000</MinBitrate>
-                <MaxBitrate>10000000</MaxBitrate>
-            </BIT28>
-          <!--  1920x1200p60 -->
-            <BIT29>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>20000000</MaxBitrate>
-            </BIT29>
-          <!--  2560x1440p30  -->
-            <BIT30>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>15000000</MaxBitrate>
-            </BIT30>
-          <!--  2560x1440p60  -->
-            <BIT31>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>20000000</MaxBitrate>
-            </BIT31>
-          <!--  2560x1600p30  -->
-            <BIT32>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>15000000</MaxBitrate>
-            </BIT32>
-          <!--  2560x1600p60  -->
-            <BIT33>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>30000000</MaxBitrate>
-            </BIT33>
-        </VESA>
-
-        <!--
-            HH Min and Max bit rates for each resolution
-            Will configure the video core with MaxBitrate
-            Based on the available link speed video bitrate
-            can go upto MinBitrate
-        -->
-        <HH>
-          <!--  800x480p30  -->
-            <BIT0>
-                <MinBitrate>500000</MinBitrate>
-                <MaxBitrate>2000000</MaxBitrate>
-            </BIT0>
-          <!--  800x480p60  -->
-            <BIT1>
-                <MinBitrate>1000000</MinBitrate>
-                <MaxBitrate>4000000</MaxBitrate>
-            </BIT1>
-          <!--  854x480p30  -->
-            <BIT2>
-                <MinBitrate>500000</MinBitrate>
-                <MaxBitrate>2000000</MaxBitrate>
-            </BIT2>
-          <!--  854x480p60  -->
-            <BIT3>
-                <MinBitrate>1000000</MinBitrate>
-                <MaxBitrate>4000000</MaxBitrate>
-            </BIT3>
-          <!--  864x480p30  -->
-            <BIT4>
-                <MinBitrate>500000</MinBitrate>
-                <MaxBitrate>2000000</MaxBitrate>
-            </BIT4>
-          <!--  864x480p60  -->
-            <BIT5>
-                <MinBitrate>1000000</MinBitrate>
-                <MaxBitrate>4000000</MaxBitrate>
-            </BIT5>
-          <!--  640x360p30  -->
-            <BIT6>
-                <MinBitrate>500000</MinBitrate>
-                <MaxBitrate>2000000</MaxBitrate>
-            </BIT6>
-          <!--  640x360p60  -->
-            <BIT7>
-                <MinBitrate>1000000</MinBitrate>
-                <MaxBitrate>4000000</MaxBitrate>
-            </BIT7>
-          <!--  960x540p30  -->
-            <BIT8>
-                <MinBitrate>500000</MinBitrate>
-                <MaxBitrate>2000000</MaxBitrate>
-            </BIT8>
-          <!--  960x540p60  -->
-            <BIT9>
-                <MinBitrate>1000000</MinBitrate>
-                <MaxBitrate>4000000</MaxBitrate>
-            </BIT9>
-          <!--  848x480p30  -->
-            <BIT10>
-                <MinBitrate>500000</MinBitrate>
-                <MaxBitrate>2000000</MaxBitrate>
-            </BIT10>
-          <!--  848x480p60  -->
-            <BIT11>
-                <MinBitrate>1000000</MinBitrate>
-                <MaxBitrate>4000000</MaxBitrate>
-            </BIT11>
-        </HH>
-    </BitrateTable>
-
-    <!--
-        To disable/enable audio stream playback
-        support during power suspend - 0 or 1
-    -->
-    <AudioStreamInSuspend>0</AudioStreamInSuspend>
-
-    <!--
-        Compensation delay for audio
-        This is maintain good AV sync in the mux TS A + V stream Recommended
-        value is 150 msec arrived at this number after fine tuning OEMs can
-        change this value in case they want
-    -->
-    <AudioAVSyncDelay>-150</AudioAVSyncDelay>
-
-    <!--
-        enable/disable CyclicIntraRefresh
-    -->
-    <CyclicIntraRefresh>0</CyclicIntraRefresh>
-
-    <!--
-        NumberOfMacroBlocks for V4L2_CID_MPEG_VIDEO_CYCLIC_INTRA_REFRESH_MB
-    -->
-    <CIRNumberOfMacroBlocks>50</CIRNumberOfMacroBlocks>
-
-    <!--
-        Enable/Disable NALU byte to detect end of AU
-    -->
-    <DisableFillerNalU>1</DisableFillerNalU>
-
-    <!--
-        Enable/Disable to generate blank frame during suspend/resume
-    -->
-    <GenerateBlankFrame>0</GenerateBlankFrame>
-
-    <!--
-        To disable fixed interval of IDR frames, set PeriodicIDRValid to 0.
-        Set the duration in seconds after which full refresh is required in
-        the PeriodicIDRInterval
-        Recommended value is 5 secs
-    -->
-    <PeriodicIDRSettings>
-        <PeriodicIDRValid>1</PeriodicIDRValid>
-        <PeriodicIDRInterval>5</PeriodicIDRInterval>
-    </PeriodicIDRSettings>
-
-
-    <!-- Direct Streaming Feature support -->
-    <StreamingSupport>1</StreamingSupport>
-
-    <!-- Enfore HDCP for Direct Streaming -->
-    <DSRequiresHDCP>1</DSRequiresHDCP>
-
-</WFDConfig>
diff --git a/sdm660-common/proprietary/etc/wfdconfigsink.xml b/sdm660-common/proprietary/etc/wfdconfigsink.xml
deleted file mode 100644
index 05e0e69..0000000
--- a/sdm660-common/proprietary/etc/wfdconfigsink.xml
+++ /dev/null
@@ -1,800 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-    <!--
-        Copyright (C) 2012 - 2019 Qualcomm Technologies, Inc.
-        All Rights Reserved.
-        Confidential and Proprietary - Qualcomm Technologies, Inc.
-    -->
-   <!-- This config file is to be used when local device is sink -->
-
-<WFDConfig>
-    <Capability>
-        <!--
-            Audio capabilities
-        -->
-        <AudioLPCM>
-            <Name>LPCM</Name>
-            <Valid>1</Valid>
-            <Channels>2</Channels>
-            <SamplingFreq>48000</SamplingFreq>
-            <Latency>33</Latency>
-        </AudioLPCM>
-
-        <AudioAAC>
-            <Name>AAC</Name>
-            <Valid>1</Valid>
-            <Channels>6</Channels>
-            <SamplingFreq>48000</SamplingFreq>
-            <Latency>0</Latency>
-        </AudioAAC>
-
-        <AudioAC3>
-            <Name>AC3</Name>
-            <Valid>0</Valid>
-            <Channels>0</Channels>
-            <SamplingFreq>0</SamplingFreq>
-            <Latency>0</Latency>
-        </AudioAC3>
-
-        <!--
-            Video capabilities additions for H264 codec
-        -->
-        <VideoFormats>
-
-            <VideoCodecHeader>
-                <TotalProfiles>7</TotalProfiles>
-                <PreferredDisplaySupport>0</PreferredDisplaySupport>
-            </VideoCodecHeader>
-             <!-- AVC Profile 0 - Constrained Baseline,
-                              1 - Constrained High,
-                              2 - Constrained High2,
-                              3 - BaseLine
-                              4 - Main
-                              5 - High
-                  HEVC Profile 0 - Main
-            -->
-
-            <!-- Level  0 - 3.1,
-                        1 - 3.2,
-                        2 - 4.0,
-                        3 - 4.1,
-                        4 - 4.2,
-                        5 - 5,
-                        6 - 5.1,
-                        7 - 5.2
-            -->
-            <VideoCodec1>
-                <CodecName>H.264</CodecName>
-                <Profile>0</Profile>
-                <Level>6</Level>
-                <HorizontalResolution>4096</HorizontalResolution>
-                <VerticalResolution>2160</VerticalResolution>
-                <Latency>0</Latency>
-                <MinimumSliceSize>0</MinimumSliceSize>
-                <SliceEncodingParams>0</SliceEncodingParams>
-                <FrameRateControlSupp>1</FrameRateControlSupp>
-                <VideoFps>30</VideoFps>
-                <TranscodingMode>1</TranscodingMode>
-                <NonTranscodingMode>1</NonTranscodingMode>
-            </VideoCodec1>
-
-            <VideoCodec2>
-                <CodecName>H.264</CodecName>
-                <Profile>1</Profile>
-                <Level>6</Level>
-                <HorizontalResolution>4096</HorizontalResolution>
-                <VerticalResolution>2160</VerticalResolution>
-                <Latency>0</Latency>
-                <MinimumSliceSize>0</MinimumSliceSize>
-                <SliceEncodingParams>0</SliceEncodingParams>
-                <FrameRateControlSupp>1</FrameRateControlSupp>
-                <VideoFps>30</VideoFps>
-                <TranscodingMode>1</TranscodingMode>
-                <NonTranscodingMode>1</NonTranscodingMode>
-            </VideoCodec2>
-
-            <VideoCodec3>
-                <CodecName>H.264</CodecName>
-                <Profile>2</Profile>
-                <Level>6</Level>
-                <HorizontalResolution>4096</HorizontalResolution>
-                <VerticalResolution>2160</VerticalResolution>
-                <Latency>0</Latency>
-                <MinimumSliceSize>0</MinimumSliceSize>
-                <SliceEncodingParams>0</SliceEncodingParams>
-                <FrameRateControlSupp>1</FrameRateControlSupp>
-                <VideoFps>30</VideoFps>
-                <TranscodingMode>1</TranscodingMode>
-                <NonTranscodingMode>1</NonTranscodingMode>
-            </VideoCodec3>
-
-            <VideoCodec4>
-                <CodecName>H.264</CodecName>
-                <Profile>3</Profile>
-                <Level>6</Level>
-                <HorizontalResolution>4096</HorizontalResolution>
-                <VerticalResolution>2160</VerticalResolution>
-                <Latency>0</Latency>
-                <MinimumSliceSize>0</MinimumSliceSize>
-                <SliceEncodingParams>0</SliceEncodingParams>
-                <FrameRateControlSupp>1</FrameRateControlSupp>
-                <VideoFps>30</VideoFps>
-                <TranscodingMode>1</TranscodingMode>
-                <NonTranscodingMode>1</NonTranscodingMode>
-            </VideoCodec4>
-
-            <VideoCodec5>
-                <CodecName>H.264</CodecName>
-                <Profile>4</Profile>
-                <Level>6</Level>
-                <HorizontalResolution>4096</HorizontalResolution>
-                <VerticalResolution>2160</VerticalResolution>
-                <Latency>0</Latency>
-                <MinimumSliceSize>0</MinimumSliceSize>
-                <SliceEncodingParams>0</SliceEncodingParams>
-                <FrameRateControlSupp>1</FrameRateControlSupp>
-                <VideoFps>30</VideoFps>
-                <TranscodingMode>1</TranscodingMode>
-                <NonTranscodingMode>1</NonTranscodingMode>
-            </VideoCodec5>
-
-            <VideoCodec6>
-                <CodecName>H.264</CodecName>
-                <Profile>5</Profile>
-                <Level>6</Level>
-                <HorizontalResolution>4096</HorizontalResolution>
-                <VerticalResolution>2160</VerticalResolution>
-                <Latency>0</Latency>
-                <MinimumSliceSize>0</MinimumSliceSize>
-                <SliceEncodingParams>0</SliceEncodingParams>
-                <FrameRateControlSupp>1</FrameRateControlSupp>
-                <VideoFps>30</VideoFps>
-                <TranscodingMode>1</TranscodingMode>
-                <NonTranscodingMode>1</NonTranscodingMode>
-            </VideoCodec6>
-
-            <VideoCodec7>
-                <CodecName>H.265</CodecName>
-                <Profile>0</Profile>
-                <Level>6</Level>
-                <HorizontalResolution>4096</HorizontalResolution>
-                <VerticalResolution>2160</VerticalResolution>
-                <Latency>0</Latency>
-                <MinimumSliceSize>0</MinimumSliceSize>
-                <SliceEncodingParams>0</SliceEncodingParams>
-                <FrameRateControlSupp>1</FrameRateControlSupp>
-                <VideoFps>30</VideoFps>
-                <TranscodingMode>1</TranscodingMode>
-                <NonTranscodingMode>1</NonTranscodingMode>
-            </VideoCodec7>
-        </VideoFormats>
-
-        <!--
-            Aux streaming is new addition
-            This is added for Direct streaming
-        -->
-        <AuxStreamInfo>
-            <Codec>
-                <Count>1</Count>
-                <Name1>PNG</Name1>
-            </Codec>
-        <!--
-            Limiting the number of layers to 5 in the overlay
-            Resolution is 1080P for Direct streaming
-        -->
-            <MaxOverlay>5</MaxOverlay>
-            <HRes>1280</HRes>
-            <VRes>720</VRes>
-            <Mode>CEA</Mode>
-        </AuxStreamInfo>
-
-        <!--
-            Standby Resume capability is supported
-        -->
-        <StandbyResumeCapability>
-            <Valid>1</Valid>
-        </StandbyResumeCapability>
-
-        <!--
-            Explicit AV format change
-            Not supported
-        -->
-        <AVFormatChange>
-            <Valid>0</Valid>
-            <AVInterval>0</AVInterval>
-        </AVFormatChange>
-
-        <!--
-            Frame skipping interval is in the scale of 500 msec or half second.
-            FrameInterval can be between 1 to 7,  according to the WFD spec.
-            0 means Frame skipping interval is infinite and recommended value is 0
-        -->
-        <FrameSkipping>
-            <Valid>1</Valid>
-            <FrameInterval>0</FrameInterval>
-        </FrameSkipping>
-
-        <!--  disable HDCP by default -->
-        <ContentProtection>
-            <Valid>0</Valid>
-            <!--
-                Valid values WFD_HDCP_2_0,
-                WFD_HDCP_2_1 and WFD_HDCP_2_2
-            -->
-            <Version>WFD_HDCP_2_2</Version>
-            <CPPort>6789</CPPort>
-        </ContentProtection>
-
-        <!--
-            To enable RTP dump at sink
-        -->
-        <RTPDumpEnable>
-            <!-- DEPRECATED -->
-            <!-- For enabling RTP parser dumping set
-                 persist.vendor.debug.rtp.enable_dump to 1
-                 /data/media/rtpdump.ts
-                 -->
-        </RTPDumpEnable>
-
-        <!--
-            UIBC by default enabled
-        -->
-        <UIBC>
-            <UIBCValid>1</UIBCValid>            <!-- 0/1 UIBC supported or not -->
-            <InputCategory>
-                <Generic>1</Generic>            <!-- 0/1 - support generic or not -->
-                <HID>1</HID>                    <!-- 0/1 - support HID or not -->
-            </InputCategory>
-
-            <!--  Supported input events  -->
-            <InputEvents>
-                <GenericInputEvents>
-                <!-- 0/1 for all Input Event Types -->
-                    <Mouse>0</Mouse>
-                    <Keyboard>1</Keyboard>
-                    <SingleTouch>1</SingleTouch>
-                    <MultiTouch>1</MultiTouch>
-                    <JoyStick>0</JoyStick>
-                    <Camera>0</Camera>
-                    <Gesture>0</Gesture>
-                    <RemoteControl>0</RemoteControl>
-                </GenericInputEvents>
-                <!--
-                Each input path will have a byte and support
-                for the input types is indicated by setting a bit:
-                KEYBOARD              BIT0
-                MOUSE                 BIT1
-                SINGLETOUCH           BIT2
-                MULTITOUCH            BIT3
-                JOYSTICK              BIT4
-                UIBC_CAMERA                BIT5
-                GESTURE               BIT6
-                REMOTECONTROL         BIT7
-                -->
-                <HIDInputPaths>
-                    <Infrared>0</Infrared>
-                    <USB>1</USB>
-                    <BT>0</BT>
-                    <Zigbee>0</Zigbee>
-                    <Wifi>0</Wifi>
-                    <NoSP>0</NoSP>
-                </HIDInputPaths>
-            </InputEvents>
-            <!--  TCP port on which UIBC connection established -->
-            <TcpPort>4321</TcpPort>
-        </UIBC>
-    </Capability>
-
-    <!--
-         Enabling Rtcp
-    -->
-    <RTCP>
-        <RtcpRREnabled>1</RtcpRREnabled>
-        <RtcpRRIntervalMs>500</RtcpRRIntervalMs>
-    </RTCP>
-
-    <!--
-        Send keep alive messages for every 50sec
-    -->
-    <SendKeepAlive>1</SendKeepAlive>
-
-    <!--
-        RTSP port on which RTSP server is running
-    -->
-    <RTSPPort>5550</RTSPPort>
-
-    <!--
-        To configure video core in SVS mode
-    -->
-    <PerformanceLevelSVSMode>1</PerformanceLevelSVSMode>
-
-    <!--
-        To configure video core in Nominal mode
-    -->
-    <PerformanceLevelNominalMode>0</PerformanceLevelNominalMode>
-
-    <!--
-        To configure video core in Turbo mode
-    -->
-    <PerformanceLevelTurboMode>0</PerformanceLevelTurboMode>
-
-    <!--
-        Bitrate settings for each mode
-    -->
-    <BitrateTable>
-        <!--
-            Bitrate table for Audio formats
-        -->
-        <AAC>
-            <BIT0>
-                <MaxBitrate>256000</MaxBitrate>
-                <MinBitrate>256000</MinBitrate>
-            </BIT0>
-            <BIT1>
-                <MaxBitrate>384000</MaxBitrate>
-                <MinBitrate>384000</MinBitrate>
-            </BIT1>
-            <BIT2>
-                <MaxBitrate>512000</MaxBitrate>
-                <MinBitrate>512000</MinBitrate>
-            </BIT2>
-        </AAC>
-
-        <!--
-            CEA Min and Max bit rates for each resolution
-            Will configure the video core with MaxBitrate
-            Based on the available link speed video bitrate
-            can go upto MinBitrate
-        -->
-        <CEA>
-          <!-- 640x480p60  -->
-            <BIT0>
-                <MinBitrate>1000000</MinBitrate>
-                <MaxBitrate>4000000</MaxBitrate>
-            </BIT0>
-          <!-- 720x480p60 -->
-            <BIT1>
-                <MinBitrate>1000000</MinBitrate>
-                <MaxBitrate>4000000</MaxBitrate>
-            </BIT1>
-          <!-- 720x480i60 -->
-            <BIT2>
-                <MinBitrate>1000000</MinBitrate>
-                <MaxBitrate>4000000</MaxBitrate>
-            </BIT2>
-          <!-- 720x576p50  -->
-            <BIT3>
-                <MinBitrate>1000000</MinBitrate>
-                <MaxBitrate>4000000</MaxBitrate>
-            </BIT3>
-          <!-- 720x576i50  -->
-            <BIT4>
-                <MinBitrate>1000000</MinBitrate>
-                <MaxBitrate>4000000</MaxBitrate>
-            </BIT4>
-          <!-- 1280x720p30  -->
-            <BIT5>
-                <MinBitrate>2500000</MinBitrate>
-                <MaxBitrate>10000000</MaxBitrate>
-            </BIT5>
-          <!-- 1280x720p60  -->
-            <BIT6>
-                <MinBitrate>5000000</MinBitrate>
-                <MaxBitrate>20000000</MaxBitrate>
-            </BIT6>
-          <!-- 1920x1080p30  -->
-            <BIT7>
-                <MinBitrate>5000000</MinBitrate>
-                <MaxBitrate>10000000</MaxBitrate>
-            </BIT7>
-          <!-- 1920x1080p60  -->
-            <BIT8>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>20000000</MaxBitrate>
-            </BIT8>
-          <!-- 1920x1080i60  -->
-            <BIT9>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>40000000</MaxBitrate>
-            </BIT9>
-          <!-- 1280x720p25  -->
-            <BIT10>
-                <MinBitrate>5000000</MinBitrate>
-                <MaxBitrate>10000000</MaxBitrate>
-            </BIT10>
-          <!-- 1280x720p50  -->
-            <BIT11>
-                <MinBitrate>5000000</MinBitrate>
-                <MaxBitrate>20000000</MaxBitrate>
-            </BIT11>
-          <!-- 1920x1080p25  -->
-            <BIT12>
-                <MinBitrate>5000000</MinBitrate>
-                <MaxBitrate>20000000</MaxBitrate>
-            </BIT12>
-          <!-- 1920x1080p50  -->
-            <BIT13>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>40000000</MaxBitrate>
-            </BIT13>
-          <!-- 1920x1080i50  -->
-            <BIT14>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>40000000</MaxBitrate>
-            </BIT14>
-          <!-- 1280x720p24  -->
-            <BIT15>
-                <MinBitrate>2500000</MinBitrate>
-                <MaxBitrate>10000000</MaxBitrate>
-            </BIT15>
-          <!-- 1920x1080p24  -->
-            <BIT16>
-                <MinBitrate>5000000</MinBitrate>
-                <MaxBitrate>20000000</MaxBitrate>
-            </BIT16>
-          <!--  3840x2160p24  -->
-            <BIT17>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>30000000</MaxBitrate>
-            </BIT17>
-          <!--  3840x2160 p25  -->
-            <BIT18>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>30000000</MaxBitrate>
-            </BIT18>
-          <!--  3840x2160p30 -->
-            <BIT19>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>30000000</MaxBitrate>
-            </BIT19>
-          <!--  3840x2160p50  -->
-            <BIT20>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>30000000</MaxBitrate>
-            </BIT20>
-          <!--  3840x2160p60 -->
-            <BIT21>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>30000000</MaxBitrate>
-            </BIT21>
-          <!--  4096x2160p24  -->
-            <BIT22>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>30000000</MaxBitrate>
-            </BIT22>
-          <!--  4096x2160p25  -->
-            <BIT23>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>30000000</MaxBitrate>
-            </BIT23>
-          <!--  4096x2160p30  -->
-            <BIT24>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>30000000</MaxBitrate>
-            </BIT24>
-          <!--  4096x2160p50  -->
-            <BIT25>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>30000000</MaxBitrate>
-            </BIT25>
-          <!--  4096x2160 p60 -->
-            <BIT26>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>30000000</MaxBitrate>
-            </BIT26>
-        </CEA>
-
-        <!--
-            VESA Min and Max bit rates for each resolution
-            Will configure the video core with MaxBitrate
-            Based on the available link speed video bitrate
-            can go upto MinBitrate
-        -->
-        <VESA>
-            <!--  800x600p30 -->
-            <BIT0>
-                <MinBitrate>500000</MinBitrate>
-                <MaxBitrate>2000000</MaxBitrate>
-            </BIT0>
-            <!--  800x600p60 -->
-            <BIT1>
-                <MinBitrate>1000000</MinBitrate>
-                <MaxBitrate>4000000</MaxBitrate>
-            </BIT1>
-            <!--  1024x768p30 -->
-            <BIT2>
-                <MinBitrate>2500000</MinBitrate>
-                <MaxBitrate>10000000</MaxBitrate>
-            </BIT2>
-            <!--  1024x768p60 -->
-            <BIT3>
-                <MinBitrate>2500000</MinBitrate>
-                <MaxBitrate>10000000</MaxBitrate>
-            </BIT3>
-            <!--  1152x864p30 -->
-            <BIT4>
-                <MinBitrate>2500000</MinBitrate>
-                <MaxBitrate>10000000</MaxBitrate>
-            </BIT4>
-            <!--  1152x864p60 -->
-            <BIT5>
-                <MinBitrate>5000000</MinBitrate>
-                <MaxBitrate>20000000</MaxBitrate>
-            </BIT5>
-            <!--  1280x768p30 -->
-            <BIT6>
-                <MinBitrate>2500000</MinBitrate>
-                <MaxBitrate>10000000</MaxBitrate>
-            </BIT6>
-            <!--  1280x768p60 -->
-            <BIT7>
-                <MinBitrate>5000000</MinBitrate>
-                <MaxBitrate>20000000</MaxBitrate>
-            </BIT7>
-            <!--  1280x800p30 -->
-            <BIT8>
-                <MinBitrate>3500000</MinBitrate>
-                <MaxBitrate>14000000</MaxBitrate>
-            </BIT8>
-            <!--  1280x800p60 -->
-            <BIT9>
-                <MinBitrate>5000000</MinBitrate>
-                <MaxBitrate>20000000</MaxBitrate>
-            </BIT9>
-            <!--  1360x768p30 -->
-            <BIT10>
-                <MinBitrate>3500000</MinBitrate>
-                <MaxBitrate>14000000</MaxBitrate>
-            </BIT10>
-            <!--  1360x768p60 -->
-            <BIT11>
-                <MinBitrate>5000000</MinBitrate>
-                <MaxBitrate>20000000</MaxBitrate>
-            </BIT11>
-            <!--  1366x768p30 -->
-            <BIT12>
-                <MinBitrate>2500000</MinBitrate>
-                <MaxBitrate>10000000</MaxBitrate>
-            </BIT12>
-            <!--  1366x768p60 -->
-            <BIT13>
-                <MinBitrate>5000000</MinBitrate>
-                <MaxBitrate>20000000</MaxBitrate>
-            </BIT13>
-            <!--  1280x1024p30 -->
-            <BIT14>
-                <MinBitrate>5000000</MinBitrate>
-                <MaxBitrate>20000000</MaxBitrate>
-            </BIT14>
-            <!--  1280x1024p60 -->
-            <BIT15>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>40000000</MaxBitrate>
-            </BIT15>
-            <!--  1400x1050p30 -->
-            <BIT16>
-                <MinBitrate>5000000</MinBitrate>
-                <MaxBitrate>20000000</MaxBitrate>
-            </BIT16>
-            <!--  1400x1050p60 -->
-            <BIT17>
-                <MinBitrate>5000000</MinBitrate>
-                <MaxBitrate>20000000</MaxBitrate>
-            </BIT17>
-            <!--  1440x900p30 -->
-            <BIT18>
-                <MinBitrate>5000000</MinBitrate>
-                <MaxBitrate>20000000</MaxBitrate>
-            </BIT18>
-            <!--  1440x900p60 -->
-            <BIT19>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>40000000</MaxBitrate>
-            </BIT19>
-            <!--  1600x900p30 -->
-            <BIT20>
-                <MinBitrate>5000000</MinBitrate>
-                <MaxBitrate>20000000</MaxBitrate>
-            </BIT20>
-            <!--  1600x900p60 -->
-            <BIT21>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>40000000</MaxBitrate>
-            </BIT21>
-            <!--  1600x1200p30 -->
-            <BIT22>
-                <MinBitrate>5000000</MinBitrate>
-                <MaxBitrate>20000000</MaxBitrate>
-            </BIT22>
-            <!--  1600x1200p60 -->
-            <BIT23>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>40000000</MaxBitrate>
-            </BIT23>
-            <!--  1680x1024p30 -->
-            <BIT24>
-                <MinBitrate>5000000</MinBitrate>
-                <MaxBitrate>20000000</MaxBitrate>
-            </BIT24>
-            <!--  1680x1024p60 -->
-            <BIT25>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>40000000</MaxBitrate>
-            </BIT25>
-            <!--  1680x1050p30 -->
-            <BIT26>
-                <MinBitrate>5000000</MinBitrate>
-                <MaxBitrate>20000000</MaxBitrate>
-            </BIT26>
-            <!--  1680x1050p60 -->
-            <BIT27>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>40000000</MaxBitrate>
-            </BIT27>
-            <!--  1920x1200p30 -->
-            <BIT28>
-                <MinBitrate>5000000</MinBitrate>
-                <MaxBitrate>20000000</MaxBitrate>
-            </BIT28>
-            <!--  1920x1200p60 -->
-            <BIT29>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>40000000</MaxBitrate>
-            </BIT29>
-            <!--  2560x1440p30  -->
-            <BIT30>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>30000000</MaxBitrate>
-            </BIT30>
-            <!--  2560x1440p60  -->
-            <BIT31>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>30000000</MaxBitrate>
-            </BIT31>
-            <!--  2560x1600p30  -->
-            <BIT32>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>30000000</MaxBitrate>
-            </BIT32>
-            <!--  2560x1600p60  -->
-            <BIT33>
-                <MinBitrate>10000000</MinBitrate>
-                <MaxBitrate>30000000</MaxBitrate>
-            </BIT33>
-        </VESA>
-
-        <!--
-            HH Min and Max bit rates for each resolution
-            Will configure the video core with MaxBitrate
-            Based on the available link speed video bitrate
-            can go upto MinBitrate
-        -->
-        <HH>
-            <!--  800x480p30  -->
-            <BIT0>
-                <MinBitrate>500000</MinBitrate>
-                <MaxBitrate>2000000</MaxBitrate>
-            </BIT0>
-            <!--  800x480p60  -->
-            <BIT1>
-                <MinBitrate>1000000</MinBitrate>
-                <MaxBitrate>4000000</MaxBitrate>
-            </BIT1>
-            <!--  854x480p30  -->
-            <BIT2>
-                <MinBitrate>500000</MinBitrate>
-                <MaxBitrate>2000000</MaxBitrate>
-            </BIT2>
-            <!--  854x480p60  -->
-            <BIT3>
-                <MinBitrate>1000000</MinBitrate>
-                <MaxBitrate>4000000</MaxBitrate>
-            </BIT3>
-            <!--  864x480p30  -->
-            <BIT4>
-                <MinBitrate>500000</MinBitrate>
-                <MaxBitrate>2000000</MaxBitrate>
-            </BIT4>
-            <!--  864x480p60  -->
-            <BIT5>
-                <MinBitrate>1000000</MinBitrate>
-                <MaxBitrate>4000000</MaxBitrate>
-            </BIT5>
-            <!--  640x360p30  -->
-            <BIT6>
-                <MinBitrate>500000</MinBitrate>
-                <MaxBitrate>2000000</MaxBitrate>
-            </BIT6>
-            <!--  640x360p60  -->
-            <BIT7>
-                <MinBitrate>1000000</MinBitrate>
-                <MaxBitrate>4000000</MaxBitrate>
-            </BIT7>
-            <!--  960x540p30  -->
-            <BIT8>
-                <MinBitrate>500000</MinBitrate>
-                <MaxBitrate>2000000</MaxBitrate>
-            </BIT8>
-            <!--  960x540p60  -->
-            <BIT9>
-                <MinBitrate>1000000</MinBitrate>
-                <MaxBitrate>4000000</MaxBitrate>
-            </BIT9>
-            <!--  848x480p30  -->
-            <BIT10>
-                <MinBitrate>500000</MinBitrate>
-                <MaxBitrate>2000000</MaxBitrate>
-            </BIT10>
-            <!--  848x480p60  -->
-            <BIT11>
-                <MinBitrate>1000000</MinBitrate>
-                <MaxBitrate>4000000</MaxBitrate>
-            </BIT11>
-        </HH>
-    </BitrateTable>
-
-    <!--
-        RetryCount is Max no of times Client request to set-up Socket connect
-        This can be applicable only to sink
-    -->
-    <RetryCount>40</RetryCount>
-
-    <!--
-        To disable/enable audio stream playback
-        support during power suspend - 0 or 1
-    -->
-    <AudioStreamInSuspend>0</AudioStreamInSuspend>
-
-    <!--
-        Compensation delay for audio
-        This is maintain good AV sync in the mux TS A + V stream Recommended
-        value is 150 msec arrived at this number after fine tuning OEMs can
-        change this value in case they want
-    -->
-    <AudioAVSyncDelay>-150</AudioAVSyncDelay>
-
-    <!--
-        To disable/enable AV Sync - 1 or 0
-        By default AV sync is enabled
-        This is only for certification
-        The reason for introducing this flag is
-        there are some issues with some test bed sources
-        if we enable AV sync though our sink is properly
-        handling AV sync
-    -->
-    <DisableAVSync>0</DisableAVSync>
-
-    <!--
-        To drop video frame in case parser detects and reports packet loss over the air
-        Three modes are supported -
-        1. 0 - Don't drop any video frame
-        2. 1 - Drop only the video frame where parser reported packet loss
-        3. 2 - Parser reported packet loss, request an IDR and drop until IDR
-    -->
-    <DropFrameOnPacketLossMode>0</DropFrameOnPacketLossMode>
-
-    <!--
-        To disable/enable Audio Track Latency - 0 or 1.
-        This adds audio track latency to renderer to improve AV sync during BT use case.
-    -->
-    <EnableAudioTrackLatency>0</EnableAudioTrackLatency>
-
-    <!--
-        Make audio AV Sync drop window configurable item.Sometimes if wlan
-        doesn't perform at required throughput,audio drops can happen due
-        to late arrival of audio frames.
-    -->
-    <AudioAVSyncDropWindow>-150000</AudioAVSyncDropWindow>
-
-    <!--
-        Make Video AV Sync drop window configurable item.Sometimes if wlan
-        doesn't perform at required throughput,Video drops can happen due
-        to late arrival of video frames.
-    -->
-    <VideoAVSyncDropWindow>-200000</VideoAVSyncDropWindow>
-
-    <!-- Direct Streaming Feature support -->
-    <StreamingSupport>1</StreamingSupport>
-
-    <Cursor>0</Cursor>
-
-</WFDConfig>
diff --git a/sdm660-common/proprietary/framework/WfdCommon.jar b/sdm660-common/proprietary/framework/WfdCommon.jar
deleted file mode 100644
index 8ee3ee6..0000000
Binary files a/sdm660-common/proprietary/framework/WfdCommon.jar and /dev/null differ
diff --git a/sdm660-common/proprietary/lib/com.qualcomm.qti.wifidisplayhal@1.0.so b/sdm660-common/proprietary/lib/com.qualcomm.qti.wifidisplayhal@1.0.so
deleted file mode 100644
index 2744180..0000000
Binary files a/sdm660-common/proprietary/lib/com.qualcomm.qti.wifidisplayhal@1.0.so and /dev/null differ
diff --git a/sdm660-common/proprietary/lib/libFileMux.so b/sdm660-common/proprietary/lib/libFileMux.so
deleted file mode 100644
index d3b9f58..0000000
Binary files a/sdm660-common/proprietary/lib/libFileMux.so and /dev/null differ
diff --git a/sdm660-common/proprietary/lib/libOmxMux.so b/sdm660-common/proprietary/lib/libOmxMux.so
deleted file mode 100644
index 9e1261e..0000000
Binary files a/sdm660-common/proprietary/lib/libOmxMux.so and /dev/null differ
diff --git a/sdm660-common/proprietary/lib/libwfdavenhancements.so b/sdm660-common/proprietary/lib/libwfdavenhancements.so
deleted file mode 100644
index 457afce..0000000
Binary files a/sdm660-common/proprietary/lib/libwfdavenhancements.so and /dev/null differ
diff --git a/sdm660-common/proprietary/lib/libwfdclient.so b/sdm660-common/proprietary/lib/libwfdclient.so
deleted file mode 100644
index 19b4a37..0000000
Binary files a/sdm660-common/proprietary/lib/libwfdclient.so and /dev/null differ
diff --git a/sdm660-common/proprietary/lib/libwfdcodecv4l2.so b/sdm660-common/proprietary/lib/libwfdcodecv4l2.so
deleted file mode 100644
index 0b6d14e..0000000
Binary files a/sdm660-common/proprietary/lib/libwfdcodecv4l2.so and /dev/null differ
diff --git a/sdm660-common/proprietary/lib/libwfdcommonutils.so b/sdm660-common/proprietary/lib/libwfdcommonutils.so
deleted file mode 100644
index c437b7f..0000000
Binary files a/sdm660-common/proprietary/lib/libwfdcommonutils.so and /dev/null differ
diff --git a/sdm660-common/proprietary/lib/libwfdconfigutils.so b/sdm660-common/proprietary/lib/libwfdconfigutils.so
deleted file mode 100644
index 66b206a..0000000
Binary files a/sdm660-common/proprietary/lib/libwfdconfigutils.so and /dev/null differ
diff --git a/sdm660-common/proprietary/lib/libwfddisplayconfig.so b/sdm660-common/proprietary/lib/libwfddisplayconfig.so
deleted file mode 100644
index c696383..0000000
Binary files a/sdm660-common/proprietary/lib/libwfddisplayconfig.so and /dev/null differ
diff --git a/sdm660-common/proprietary/lib/libwfdmminterface.so b/sdm660-common/proprietary/lib/libwfdmminterface.so
deleted file mode 100644
index 19fedbe..0000000
Binary files a/sdm660-common/proprietary/lib/libwfdmminterface.so and /dev/null differ
diff --git a/sdm660-common/proprietary/lib/libwfdmmsink.so b/sdm660-common/proprietary/lib/libwfdmmsink.so
deleted file mode 100644
index 60da922..0000000
Binary files a/sdm660-common/proprietary/lib/libwfdmmsink.so and /dev/null differ
diff --git a/sdm660-common/proprietary/lib/libwfdmmsrc.so b/sdm660-common/proprietary/lib/libwfdmmsrc.so
deleted file mode 100644
index aea4acf..0000000
Binary files a/sdm660-common/proprietary/lib/libwfdmmsrc.so and /dev/null differ
diff --git a/sdm660-common/proprietary/lib/libwfdnative.so b/sdm660-common/proprietary/lib/libwfdnative.so
deleted file mode 100644
index c724ff3..0000000
Binary files a/sdm660-common/proprietary/lib/libwfdnative.so and /dev/null differ
diff --git a/sdm660-common/proprietary/lib/libwfdrtsp.so b/sdm660-common/proprietary/lib/libwfdrtsp.so
deleted file mode 100644
index 6c76cec..0000000
Binary files a/sdm660-common/proprietary/lib/libwfdrtsp.so and /dev/null differ
diff --git a/sdm660-common/proprietary/lib/libwfdservice.so b/sdm660-common/proprietary/lib/libwfdservice.so
deleted file mode 100644
index 8417f7f..0000000
Binary files a/sdm660-common/proprietary/lib/libwfdservice.so and /dev/null differ
diff --git a/sdm660-common/proprietary/lib/libwfdsm.so b/sdm660-common/proprietary/lib/libwfdsm.so
deleted file mode 100644
index fa762e7..0000000
Binary files a/sdm660-common/proprietary/lib/libwfdsm.so and /dev/null differ
diff --git a/sdm660-common/proprietary/lib/libwfduibcinterface.so b/sdm660-common/proprietary/lib/libwfduibcinterface.so
deleted file mode 100644
index 479a1cc..0000000
Binary files a/sdm660-common/proprietary/lib/libwfduibcinterface.so and /dev/null differ
diff --git a/sdm660-common/proprietary/lib/libwfduibcsink.so b/sdm660-common/proprietary/lib/libwfduibcsink.so
deleted file mode 100644
index 5a77b74..0000000
Binary files a/sdm660-common/proprietary/lib/libwfduibcsink.so and /dev/null differ
diff --git a/sdm660-common/proprietary/lib/libwfduibcsinkinterface.so b/sdm660-common/proprietary/lib/libwfduibcsinkinterface.so
deleted file mode 100644
index 1c2e433..0000000
Binary files a/sdm660-common/proprietary/lib/libwfduibcsinkinterface.so and /dev/null differ
diff --git a/sdm660-common/proprietary/lib/libwfduibcsrc.so b/sdm660-common/proprietary/lib/libwfduibcsrc.so
deleted file mode 100644
index 5d228ba..0000000
Binary files a/sdm660-common/proprietary/lib/libwfduibcsrc.so and /dev/null differ
diff --git a/sdm660-common/proprietary/lib/libwfduibcsrcinterface.so b/sdm660-common/proprietary/lib/libwfduibcsrcinterface.so
deleted file mode 100644
index 080ad66..0000000
Binary files a/sdm660-common/proprietary/lib/libwfduibcsrcinterface.so and /dev/null differ
diff --git a/sdm660-common/proprietary/lib64/libFileMux.so b/sdm660-common/proprietary/lib64/libFileMux.so
deleted file mode 100644
index e2e119e..0000000
Binary files a/sdm660-common/proprietary/lib64/libFileMux.so and /dev/null differ
diff --git a/sdm660-common/proprietary/lib64/libOmxMux.so b/sdm660-common/proprietary/lib64/libOmxMux.so
deleted file mode 100644
index 0537243..0000000
Binary files a/sdm660-common/proprietary/lib64/libOmxMux.so and /dev/null differ
diff --git a/sdm660-common/proprietary/lib64/libwfdclient.so b/sdm660-common/proprietary/lib64/libwfdclient.so
deleted file mode 100644
index d920c2d..0000000
Binary files a/sdm660-common/proprietary/lib64/libwfdclient.so and /dev/null differ
diff --git a/sdm660-common/proprietary/lib64/libwfdnative.so b/sdm660-common/proprietary/lib64/libwfdnative.so
deleted file mode 100644
index c252269..0000000
Binary files a/sdm660-common/proprietary/lib64/libwfdnative.so and /dev/null differ
diff --git a/sdm660-common/proprietary/priv-app/WfdService/WfdService.apk b/sdm660-common/proprietary/priv-app/WfdService/WfdService.apk
deleted file mode 100644
index e55098f..0000000
Binary files a/sdm660-common/proprietary/priv-app/WfdService/WfdService.apk and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/lib/libmmosal.so b/sdm660-common/proprietary/system_ext/lib/libmmosal.so
deleted file mode 100644
index ef81afa..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib/libmmosal.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/lib/libmmparser_lite.so b/sdm660-common/proprietary/system_ext/lib/libmmparser_lite.so
deleted file mode 100644
index 9ee8993..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib/libmmparser_lite.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/libmmosal.so b/sdm660-common/proprietary/system_ext/lib64/libmmosal.so
deleted file mode 100644
index 78cfa77..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/libmmosal.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/libmmparser_lite.so b/sdm660-common/proprietary/system_ext/lib64/libmmparser_lite.so
deleted file mode 100644
index ba35e88..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/libmmparser_lite.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/bin/wifidisplayhalservice b/sdm660-common/proprietary/vendor/bin/wifidisplayhalservice
deleted file mode 100755
index 951894c..0000000
Binary files a/sdm660-common/proprietary/vendor/bin/wifidisplayhalservice and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/etc/init/com.qualcomm.qti.wifidisplayhal@1.0-service.rc b/sdm660-common/proprietary/vendor/etc/init/com.qualcomm.qti.wifidisplayhal@1.0-service.rc
deleted file mode 100644
index 89d9b71..0000000
--- a/sdm660-common/proprietary/vendor/etc/init/com.qualcomm.qti.wifidisplayhal@1.0-service.rc
+++ /dev/null
@@ -1,4 +0,0 @@
-service wifidisplayhalservice /vendor/bin/wifidisplayhalservice
-  class main
-  user system
-  group drmrpc inet input net_admin mediadrm audio system
diff --git a/sdm660-common/proprietary/vendor/lib/com.qualcomm.qti.wifidisplayhal@1.0-halimpl.so b/sdm660-common/proprietary/vendor/lib/com.qualcomm.qti.wifidisplayhal@1.0-halimpl.so
deleted file mode 100644
index 18d29c0..0000000
Binary files a/sdm660-common/proprietary/vendor/lib/com.qualcomm.qti.wifidisplayhal@1.0-halimpl.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib/com.qualcomm.qti.wifidisplayhal@1.0.so b/sdm660-common/proprietary/vendor/lib/com.qualcomm.qti.wifidisplayhal@1.0.so
deleted file mode 100644
index 3f37144..0000000
Binary files a/sdm660-common/proprietary/vendor/lib/com.qualcomm.qti.wifidisplayhal@1.0.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib/libmmosal.so b/sdm660-common/proprietary/vendor/lib/libmmosal.so
deleted file mode 100644
index b7ac69f..0000000
Binary files a/sdm660-common/proprietary/vendor/lib/libmmosal.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib/libwfdcommonutils_proprietary.so b/sdm660-common/proprietary/vendor/lib/libwfdcommonutils_proprietary.so
deleted file mode 100644
index a88cfe6..0000000
Binary files a/sdm660-common/proprietary/vendor/lib/libwfdcommonutils_proprietary.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib/libwfddisplayconfig_proprietary.so b/sdm660-common/proprietary/vendor/lib/libwfddisplayconfig_proprietary.so
deleted file mode 100644
index 9f01945..0000000
Binary files a/sdm660-common/proprietary/vendor/lib/libwfddisplayconfig_proprietary.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib/libwfdhaldsmanager.so b/sdm660-common/proprietary/vendor/lib/libwfdhaldsmanager.so
deleted file mode 100644
index aa6506c..0000000
Binary files a/sdm660-common/proprietary/vendor/lib/libwfdhaldsmanager.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib/libwfdhdcpcp.so b/sdm660-common/proprietary/vendor/lib/libwfdhdcpcp.so
deleted file mode 100644
index 77506d2..0000000
Binary files a/sdm660-common/proprietary/vendor/lib/libwfdhdcpcp.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib/libwfdmmservice.so b/sdm660-common/proprietary/vendor/lib/libwfdmmservice.so
deleted file mode 100644
index ac0955a..0000000
Binary files a/sdm660-common/proprietary/vendor/lib/libwfdmmservice.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib/libwfdmodulehdcpsession.so b/sdm660-common/proprietary/vendor/lib/libwfdmodulehdcpsession.so
deleted file mode 100644
index 702aa0b..0000000
Binary files a/sdm660-common/proprietary/vendor/lib/libwfdmodulehdcpsession.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libmmosal.so b/sdm660-common/proprietary/vendor/lib64/libmmosal.so
deleted file mode 100644
index 415375e..0000000
Binary files a/sdm660-common/proprietary/vendor/lib64/libmmosal.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libwfdhdcpcp.so b/sdm660-common/proprietary/vendor/lib64/libwfdhdcpcp.so
deleted file mode 100644
index 99a1fe4..0000000
Binary files a/sdm660-common/proprietary/vendor/lib64/libwfdhdcpcp.so and /dev/null differ
diff --git a/sdm660-common/sdm660-common-vendor.mk b/sdm660-common/sdm660-common-vendor.mk
index 5a346a1..43cc3db 100644
--- a/sdm660-common/sdm660-common-vendor.mk
+++ b/sdm660-common/sdm660-common-vendor.mk
@@ -6,35 +6,6 @@ PRODUCT_SOONG_NAMESPACES += \
     vendor/asus/sdm660-common
 
 PRODUCT_COPY_FILES += \
-    vendor/asus/sdm660-common/proprietary/bin/wfdservice:$(TARGET_COPY_OUT_SYSTEM)/bin/wfdservice \
-    vendor/asus/sdm660-common/proprietary/etc/init/wfdservice.rc:$(TARGET_COPY_OUT_SYSTEM)/etc/init/wfdservice.rc \
-    vendor/asus/sdm660-common/proprietary/etc/wfdconfig.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/wfdconfig.xml \
-    vendor/asus/sdm660-common/proprietary/etc/wfdconfigsink.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/wfdconfigsink.xml \
-    vendor/asus/sdm660-common/proprietary/lib/com.qualcomm.qti.wifidisplayhal@1.0.so:$(TARGET_COPY_OUT_SYSTEM)/lib/com.qualcomm.qti.wifidisplayhal@1.0.so \
-    vendor/asus/sdm660-common/proprietary/lib/libFileMux.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libFileMux.so \
-    vendor/asus/sdm660-common/proprietary/lib/libOmxMux.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libOmxMux.so \
-    vendor/asus/sdm660-common/proprietary/lib/libwfdavenhancements.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfdavenhancements.so \
-    vendor/asus/sdm660-common/proprietary/lib/libwfdclient.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfdclient.so \
-    vendor/asus/sdm660-common/proprietary/lib/libwfdcodecv4l2.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfdcodecv4l2.so \
-    vendor/asus/sdm660-common/proprietary/lib/libwfdcommonutils.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfdcommonutils.so \
-    vendor/asus/sdm660-common/proprietary/lib/libwfdconfigutils.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfdconfigutils.so \
-    vendor/asus/sdm660-common/proprietary/lib/libwfddisplayconfig.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfddisplayconfig.so \
-    vendor/asus/sdm660-common/proprietary/lib/libwfdmminterface.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfdmminterface.so \
-    vendor/asus/sdm660-common/proprietary/lib/libwfdmmsink.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfdmmsink.so \
-    vendor/asus/sdm660-common/proprietary/lib/libwfdmmsrc.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfdmmsrc.so \
-    vendor/asus/sdm660-common/proprietary/lib/libwfdnative.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfdnative.so \
-    vendor/asus/sdm660-common/proprietary/lib/libwfdrtsp.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfdrtsp.so \
-    vendor/asus/sdm660-common/proprietary/lib/libwfdservice.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfdservice.so \
-    vendor/asus/sdm660-common/proprietary/lib/libwfdsm.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfdsm.so \
-    vendor/asus/sdm660-common/proprietary/lib/libwfduibcinterface.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfduibcinterface.so \
-    vendor/asus/sdm660-common/proprietary/lib/libwfduibcsink.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfduibcsink.so \
-    vendor/asus/sdm660-common/proprietary/lib/libwfduibcsinkinterface.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfduibcsinkinterface.so \
-    vendor/asus/sdm660-common/proprietary/lib/libwfduibcsrc.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfduibcsrc.so \
-    vendor/asus/sdm660-common/proprietary/lib/libwfduibcsrcinterface.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfduibcsrcinterface.so \
-    vendor/asus/sdm660-common/proprietary/lib64/libFileMux.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libFileMux.so \
-    vendor/asus/sdm660-common/proprietary/lib64/libOmxMux.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libOmxMux.so \
-    vendor/asus/sdm660-common/proprietary/lib64/libwfdclient.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libwfdclient.so \
-    vendor/asus/sdm660-common/proprietary/lib64/libwfdnative.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libwfdnative.so \
     vendor/asus/sdm660-common/proprietary/product/etc/permissions/telephony_product_privapp-permissions-qti.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/telephony_product_privapp-permissions-qti.xml \
     vendor/asus/sdm660-common/proprietary/product/lib64/libaptXHD_encoder.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libaptXHD_encoder.so \
     vendor/asus/sdm660-common/proprietary/product/lib64/libaptX_encoder.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libaptX_encoder.so \
@@ -74,8 +45,6 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/system_ext/lib/libadsprpc_system.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libadsprpc_system.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib/libcdsprpc_system.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libcdsprpc_system.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib/libmdsprpc_system.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libmdsprpc_system.so \
-    vendor/asus/sdm660-common/proprietary/system_ext/lib/libmmosal.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libmmosal.so \
-    vendor/asus/sdm660-common/proprietary/system_ext/lib/libmmparser_lite.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libmmparser_lite.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib/libsdsprpc_system.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libsdsprpc_system.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.dpm.api@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/com.qualcomm.qti.dpm.api@1.0.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.imscmservice@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/com.qualcomm.qti.imscmservice@1.0.so \
@@ -117,8 +86,6 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/libmink-sock-native-api.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmink-sock-native-api.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/libminksocket_system.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libminksocket_system.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/libmmi.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmmi.so \
-    vendor/asus/sdm660-common/proprietary/system_ext/lib64/libmmosal.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmmosal.so \
-    vendor/asus/sdm660-common/proprietary/system_ext/lib64/libmmparser_lite.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmmparser_lite.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/libmmrtpdecoder.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmmrtpdecoder.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/libmmrtpencoder.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmmrtpencoder.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/libmsp.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmsp.so \
@@ -251,7 +218,6 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/bin/thermal-engine:$(TARGET_COPY_OUT_VENDOR)/bin/thermal-engine \
     vendor/asus/sdm660-common/proprietary/vendor/bin/time_daemon:$(TARGET_COPY_OUT_VENDOR)/bin/time_daemon \
     vendor/asus/sdm660-common/proprietary/vendor/bin/vendor.qti.hardware.soter@1.0-provision:$(TARGET_COPY_OUT_VENDOR)/bin/vendor.qti.hardware.soter@1.0-provision \
-    vendor/asus/sdm660-common/proprietary/vendor/bin/wifidisplayhalservice:$(TARGET_COPY_OUT_VENDOR)/bin/wifidisplayhalservice \
     vendor/asus/sdm660-common/proprietary/vendor/bin/xtra-daemon:$(TARGET_COPY_OUT_VENDOR)/bin/xtra-daemon \
     vendor/asus/sdm660-common/proprietary/vendor/bin/xtwifi-client:$(TARGET_COPY_OUT_VENDOR)/bin/xtwifi-client \
     vendor/asus/sdm660-common/proprietary/vendor/bin/xtwifi-inet-agent:$(TARGET_COPY_OUT_VENDOR)/bin/xtwifi-inet-agent \
@@ -293,7 +259,6 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/android.hardware.gatekeeper@1.0-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.gatekeeper@1.0-service-qti.rc \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/android.hardware.keymaster@3.0-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.keymaster@3.0-service-qti.rc \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/cnd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/cnd.rc \
-    vendor/asus/sdm660-common/proprietary/vendor/etc/init/com.qualcomm.qti.wifidisplayhal@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/com.qualcomm.qti.wifidisplayhal@1.0-service.rc \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/dataadpl.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/dataadpl.rc \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/dataqti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/dataqti.rc \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/dpmQmiMgr.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/dpmQmiMgr.rc \
@@ -337,8 +302,6 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/etc/ssg/ta_config.json:$(TARGET_COPY_OUT_VENDOR)/etc/ssg/ta_config.json \
     vendor/asus/sdm660-common/proprietary/vendor/etc/ssg/tz_whitelist.json:$(TARGET_COPY_OUT_VENDOR)/etc/ssg/tz_whitelist.json \
     vendor/asus/sdm660-common/proprietary/vendor/etc/xtra_root_cert.pem:$(TARGET_COPY_OUT_VENDOR)/etc/xtra_root_cert.pem \
-    vendor/asus/sdm660-common/proprietary/vendor/lib/com.qualcomm.qti.wifidisplayhal@1.0-halimpl.so:$(TARGET_COPY_OUT_VENDOR)/lib/com.qualcomm.qti.wifidisplayhal@1.0-halimpl.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib/com.qualcomm.qti.wifidisplayhal@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/com.qualcomm.qti.wifidisplayhal@1.0.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/egl/eglSubDriverAndroid.so:$(TARGET_COPY_OUT_VENDOR)/lib/egl/eglSubDriverAndroid.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/egl/libEGL_adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib/egl/libEGL_adreno.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/egl/libGLESv1_CM_adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib/egl/libGLESv1_CM_adreno.so \
@@ -408,7 +371,6 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libmdmdetect.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmdmdetect.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libmdsprpc.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmdsprpc.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libmmcamera_ppeiscore.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmmcamera_ppeiscore.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib/libmmosal.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmmosal.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libperfconfig.so:$(TARGET_COPY_OUT_VENDOR)/lib/libperfconfig.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libperfgluelayer.so:$(TARGET_COPY_OUT_VENDOR)/lib/libperfgluelayer.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libpn553_fw.so:$(TARGET_COPY_OUT_VENDOR)/lib/libpn553_fw.so \
@@ -446,12 +408,6 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libsysmon_cdsp_skel.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsysmon_cdsp_skel.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libsystem_health_mon.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsystem_health_mon.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libtinyxml2_1.so:$(TARGET_COPY_OUT_VENDOR)/lib/libtinyxml2_1.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib/libwfdcommonutils_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfdcommonutils_proprietary.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib/libwfddisplayconfig_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfddisplayconfig_proprietary.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib/libwfdhaldsmanager.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfdhaldsmanager.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib/libwfdhdcpcp.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfdhdcpcp.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib/libwfdmmservice.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfdmmservice.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib/libwfdmodulehdcpsession.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfdmodulehdcpsession.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/rfsa/adsp/capi_v2_aptX_Classic.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/capi_v2_aptX_Classic.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/rfsa/adsp/capi_v2_aptX_HD.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/capi_v2_aptX_HD.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/rfsa/adsp/libFastRPC_AUE_Forward_skel.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/libFastRPC_AUE_Forward_skel.so \
@@ -615,7 +571,6 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libminkdescriptor.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libminkdescriptor.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libminksocket.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libminksocket.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libmm-hdcpmgr.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmm-hdcpmgr.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib64/libmmosal.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmmosal.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libnative-api.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libnative-api.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libnetmgr.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libnetmgr.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libnetmgr_common.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libnetmgr_common.so \
@@ -688,7 +643,6 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libsystem_health_mon.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsystem_health_mon.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libtinyxml2_1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libtinyxml2_1.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libtzdrmgenprov.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libtzdrmgenprov.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib64/libwfdhdcpcp.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libwfdhdcpcp.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libwms.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libwms.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libwqe.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libwqe.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libwvhidl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libwvhidl.so \
@@ -796,7 +750,6 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     libthermalclient \
     libtime_genoff \
-    WfdService \
     CACertService \
     CneApp \
     IWlanService \
@@ -829,7 +782,6 @@ PRODUCT_PACKAGES += \
     dpmserviceapp \
     ims \
     qcrilmsgtunnel \
-    WfdCommon \
     tcmclient \
     ActivityExt \
     audiosphere \