diff --git a/Android.bp b/Android.bp
index 3666c83..61356ac 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12441,665 +12441,6 @@ cc_prebuilt_library_shared {
     system_ext_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libmmrtpdecoder",
-    owner: "motorola",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/lib64/libmmrtpdecoder.so",
-            ],
-            shared_libs: [
-                "libutils",
-                "liblog",
-                "libcutils",
-                "libmmosal",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libmmrtpencoder",
-    owner: "motorola",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/lib64/libmmrtpencoder.so",
-            ],
-            shared_libs: [
-                "libmmosal",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libwfdavenhancements",
-    owner: "motorola",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/lib64/libwfdavenhancements.so",
-            ],
-            shared_libs: [
-                "liblog",
-                "libbinder",
-                "libutils",
-                "libgui",
-                "libui",
-                "libstagefright_foundation",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libwfdclient",
-    owner: "motorola",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/lib64/libwfdclient.so",
-            ],
-            shared_libs: [
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libbinder",
-                "libgui",
-                "libmmosal",
-                "libinput",
-                "libwfdsinksm",
-                "libwfdcommonutils",
-                "libwfdconfigutils",
-                "libwfdmminterface",
-                "libnativewindow",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libwfdcommonutils",
-    owner: "motorola",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/lib64/libwfdcommonutils.so",
-            ],
-            shared_libs: [
-                "libmmosal",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libbinder",
-                "libnl",
-                "libwfdmminterface",
-                "libwfdconfigutils",
-                "libui",
-                "libgui",
-                "libwfddisplayconfig",
-                "libion",
-                "libprocessgroup",
-                "libdng_sdk",
-                "libjpeg",
-                "libpiex",
-                "libpng",
-                "libheif",
-                "libnativewindow",
-                "libEGL",
-                "libGLESv2",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libwfdconfigutils",
-    owner: "motorola",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/lib64/libwfdconfigutils.so",
-            ],
-            shared_libs: [
-                "libmmosal",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libbinder",
-                "libnl",
-                "libwfdmminterface",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libwfddisplayconfig",
-    owner: "motorola",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/lib64/libwfddisplayconfig.so",
-            ],
-            shared_libs: [
-                "libhidlbase",
-                "libutils",
-                "libcutils",
-                "liblog",
-                "vendor.display.config@2.0",
-                "libdisplayconfig.system.qti",
-                "libbinder_ndk",
-                "vendor.qti.hardware.display.config-V5-ndk",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libwfdmminterface",
-    owner: "motorola",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/lib64/libwfdmminterface.so",
-            ],
-            shared_libs: [
-                "libmmosal",
-                "liblog",
-                "libutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libwfdmmsink",
-    owner: "motorola",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/lib64/libwfdmmsink.so",
-            ],
-            shared_libs: [
-                "libmmosal",
-                "liblog",
-                "libutils",
-                "libmedia",
-                "libaudioclient",
-                "libgui",
-                "libbinder",
-                "libwfdcommonutils",
-                "libwfdconfigutils",
-                "libui",
-                "libmmparser_lite",
-                "libmmrtpdecoder",
-                "libcutils",
-                "libwfddisplayconfig",
-                "libhwui",
-                "libwfdmminterface",
-                "libhidlbase",
-                "libhidlmemory",
-                "android.hidl.allocator@1.0",
-                "android.hidl.memory@1.0",
-                "libandroid",
-                "libmediandk",
-                "libaaudio",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libwfdmmsrc_system",
-    owner: "motorola",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/lib64/libwfdmmsrc_system.so",
-            ],
-            shared_libs: [
-                "libbinder",
-                "libmmosal",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libgui",
-                "libui",
-                "libwfdcommonutils",
-                "libwfdconfigutils",
-                "libinput",
-                "libwfdmminterface",
-                "libwfddisplayconfig",
-                "libmedia_helper",
-                "libaudioclient",
-                "libwfdavenhancements",
-                "libhidlbase",
-                "libgralloctypes",
-                "android.hardware.graphics.mapper@4.0",
-                "libvndksupport",
-                "android.hardware.graphics.allocator@4.0",
-                "android.hardware.graphics.allocator-V2-ndk",
-                "libbinder_ndk",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libwfdnative",
-    owner: "motorola",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/lib64/libwfdnative.so",
-            ],
-            shared_libs: [
-                "libinput_shim",
-                "libandroid_runtime",
-                "libui",
-                "libinput",
-                "libnativehelper",
-                "libutils",
-                "liblog",
-                "libwfdclient",
-                "libhidlbase",
-                "libhidlmemory",
-                "libbinder",
-                "libgui",
-                "android.hidl.base@1.0",
-                "android.hidl.token@1.0-utils",
-                "android.hardware.graphics.common@1.0",
-                "android.hardware.graphics.bufferqueue@1.0",
-                "android.hardware.graphics.bufferqueue@2.0",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libwfdrtsp",
-    owner: "motorola",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/lib64/libwfdrtsp.so",
-            ],
-            shared_libs: [
-                "libc++",
-                "libcutils",
-                "libutils",
-                "libmmosal",
-                "libwfdcommonutils",
-                "libwfdconfigutils",
-                "liblog",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libwfdservice",
-    owner: "motorola",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/lib64/libwfdservice.so",
-            ],
-            shared_libs: [
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libbinder",
-                "libgui",
-                "libwfdsinksm",
-                "libmmosal",
-                "libwfdcommonutils",
-                "libwfdconfigutils",
-                "libinput",
-                "libwfdmminterface",
-                "libmedia_helper",
-                "libaudioclient",
-                "libaudiofoundation",
-                "audioclient-types-aidl-cpp",
-                "android.media.audio.common.types-V4-cpp",
-                "libwfdmmsrc_system",
-                "libwfdavenhancements",
-                "libhidlbase",
-                "vendor.qti.hardware.wifidisplaysession@1.0",
-                "vendor.qti.hardware.wifidisplaysession_aidl-V1-ndk",
-                "libbinder_ndk",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libwfdsinksm",
-    owner: "motorola",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/lib64/libwfdsinksm.so",
-            ],
-            shared_libs: [
-                "libc++",
-                "libcutils",
-                "libutils",
-                "libwfdrtsp",
-                "libwfduibcinterface",
-                "libwfdmmsink",
-                "libmmosal",
-                "libmedia",
-                "libwfdcommonutils",
-                "libwfdconfigutils",
-                "libwfdmminterface",
-                "libmmrtpencoder",
-                "libmmrtpdecoder",
-                "libhidlbase",
-                "libnativewindow",
-                "libmediandk",
-                "liblog",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libwfduibcinterface",
-    owner: "motorola",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/lib64/libwfduibcinterface.so",
-            ],
-            shared_libs: [
-                "libmmosal",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libwfduibcsrcinterface",
-                "libwfduibcsinkinterface",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libwfduibcsink",
-    owner: "motorola",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/lib64/libwfduibcsink.so",
-            ],
-            shared_libs: [
-                "libmmosal",
-                "libutils",
-                "liblog",
-                "libcutils",
-                "libwfdconfigutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libwfduibcsinkinterface",
-    owner: "motorola",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/lib64/libwfduibcsinkinterface.so",
-            ],
-            shared_libs: [
-                "libmmosal",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libwfduibcsink",
-                "libwfdcommonutils",
-                "libwfdconfigutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libwfduibcsrc",
-    owner: "motorola",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/lib64/libwfduibcsrc.so",
-            ],
-            shared_libs: [
-                "libmmosal",
-                "libwfdcommonutils",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libwfdconfigutils",
-                "libwfddisplayconfig",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libwfduibcsrcinterface",
-    owner: "motorola",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/lib64/libwfduibcsrcinterface.so",
-            ],
-            shared_libs: [
-                "libmmosal",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libwfduibcsrc",
-                "libwfdcommonutils",
-                "libwfdconfigutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    system_ext_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "vendor.qti.ImsRtpService-V1-ndk",
     owner: "motorola",
@@ -13180,60 +12521,6 @@ cc_prebuilt_library_shared {
     system_ext_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "vendor.qti.hardware.wifidisplaysession@1.0",
-    owner: "motorola",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/lib64/vendor.qti.hardware.wifidisplaysession@1.0.so",
-            ],
-            shared_libs: [
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "vendor.qti.hardware.wifidisplaysession_aidl-V1-ndk",
-    owner: "motorola",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/lib64/vendor.qti.hardware.wifidisplaysession_aidl-V1-ndk.so",
-            ],
-            shared_libs: [
-                "libbinder_ndk",
-                "android.hardware.common-V2-ndk",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    system_ext_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "vendor.qti.imsrtpservice@3.0",
     owner: "motorola",
@@ -13383,18 +12670,6 @@ android_app_import {
     system_ext_specific: true,
 }
 
-android_app_import {
-    name: "WfdService",
-    owner: "motorola",
-    apk: "proprietary/system_ext/priv-app/WfdService/WfdService.apk",
-    certificate: "platform",
-    dex_preopt: {
-        enabled: false,
-    },
-    privileged: true,
-    system_ext_specific: true,
-}
-
 android_app_import {
     name: "dpmserviceapp",
     owner: "motorola",
@@ -13431,14 +12706,6 @@ android_app_import {
     system_ext_specific: true,
 }
 
-dex_import {
-    name: "WfdCommon",
-    owner: "motorola",
-    jars: [
-        "proprietary/system/framework/WfdCommon.jar",
-    ],
-}
-
 dex_import {
     name: "uimgbalibrary",
     owner: "motorola",
@@ -15537,40 +14804,6 @@ cc_prebuilt_binary {
     system_ext_specific: true,
 }
 
-cc_prebuilt_binary {
-    name: "wfdservice",
-    owner: "motorola",
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/bin/wfdservice",
-            ],
-            shared_libs: [
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libbinder",
-                "libwfdservice",
-                "libmmosal",
-                "libwfdcommonutils",
-                "libwfdconfigutils",
-                "libhidlbase",
-                "libavservices_minijail",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    strip: {
-        none: true,
-    },
-    prefer: true,
-    system_ext_specific: true,
-}
-
 install_symlink {
     name: "system_ext_priv-app_ims_lib_arm64_libimscamera_jni_so",
     system_ext_specific: true,
@@ -15585,13 +14818,6 @@ install_symlink {
     symlink_target: "/system_ext/lib64/libimsmedia_jni.so",
 }
 
-install_symlink {
-    name: "system_ext_priv-app_WfdService_lib_arm64_libwfdnative_so",
-    system_ext_specific: true,
-    installed_location: "priv-app/WfdService/lib/arm64/libwfdnative.so",
-    symlink_target: "/system_ext/lib64/libwfdnative.so",
-}
-
 install_symlink {
     name: "vendor_bin_expat",
     soc_specific: true,
diff --git a/proprietary/system/framework/WfdCommon.jar b/proprietary/system/framework/WfdCommon.jar
deleted file mode 100644
index 61a53cf..0000000
Binary files a/proprietary/system/framework/WfdCommon.jar and /dev/null differ
diff --git a/proprietary/system_ext/bin/wfdservice b/proprietary/system_ext/bin/wfdservice
deleted file mode 100755
index e8f7d1d..0000000
Binary files a/proprietary/system_ext/bin/wfdservice and /dev/null differ
diff --git a/proprietary/system_ext/etc/init/wfdservice.rc b/proprietary/system_ext/etc/init/wfdservice.rc
deleted file mode 100644
index a11d7c2..0000000
--- a/proprietary/system_ext/etc/init/wfdservice.rc
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Copyright (c) 2019-2021 Qualcomm Technologies, Inc.
-# All Rights Reserved.
-# Confidential and Proprietary - Qualcomm Technologies, Inc.
-#
-service wfdservice /system_ext/bin/wfdservice
-    class main
-    user system
-    disabled
-    oneshot
-
-service wfdservice64 /system_ext/bin/wfdservice64
-    class main
-    user system
-    disabled
-    oneshot
-
-on property:vendor.wfdservice=enable
-    start wfdservice
-
-on property:vendor.wfdservice64=enable
-    start wfdservice64
-
-on property:vendor.wfdservice=disable
-    stop wfdservice
-
-on property:vendor.wfdservice64=disable
-    stop wfdservice64
diff --git a/proprietary/system_ext/etc/permissions/wfd-system-ext-privapp-permissions-qti.xml b/proprietary/system_ext/etc/permissions/wfd-system-ext-privapp-permissions-qti.xml
deleted file mode 100644
index 7c49ca9..0000000
--- a/proprietary/system_ext/etc/permissions/wfd-system-ext-privapp-permissions-qti.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!--
-  Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
-  All rights reserved.
-  Confidential and Proprietary - Qualcomm Technologies, Inc.
--->
-<permissions>
-    <privapp-permissions package="com.qualcomm.wfd.service">
-        <permission name="android.permission.WRITE_MEDIA_STORAGE"/>
-        <permission name="android.permission.START_FOREGROUND_SERVICES_FROM_BACKGROUND"/>
-        <permission name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK"/>
-    </privapp-permissions>
-</permissions>
diff --git a/proprietary/system_ext/etc/seccomp_policy/wfdservice64.policy b/proprietary/system_ext/etc/seccomp_policy/wfdservice64.policy
deleted file mode 100644
index 98b3c11..0000000
--- a/proprietary/system_ext/etc/seccomp_policy/wfdservice64.policy
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright (c) 2021, 2022 Qualcomm Technologies, Inc.
-# All Rights Reserved.
-# Confidential and Proprietary - Qualcomm Technologies, Inc
-#
-# Not a contribution.
-#
-# Copyright (C) 2019 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-mmap: arg2 in ~PROT_EXEC || arg2 in ~PROT_WRITE
-mprotect: arg2 in ~PROT_EXEC || arg2 in ~PROT_WRITE
-munmap: 1
-futex: 1
-#prctl: arg0 == PR_SET_VMA || arg0 == PR_GET_DUMPABLE
-prctl: 1
-#ioctl: arg1 == BINDER_VERSION || arg1 == BINDER_WRITE_READ || arg1 == BINDER_SET_MAX_THREADS
-ioctl: 1
-close: 1
-openat: 1
-mremap: 1
-fstat: 1
-readlinkat: 1
-pread64: 1
-fstatfs: 1
-clock_gettime: 1
-fstatat: 1
-read: 1
-write: 1
-fcntl: 1
-ppoll: 1
-faccessat: 1
-rt_sigaction: 1
-getuid: 1
-madvise: 1
-rt_sigprocmask: 1
-writev: 1
-personality: 1
-getrandom: 1
-gettimeofday: 1
-#set_tls: 1
-statfs: 1
-ugetrlimit: 1
-getrlimit: 1
-execve: 1
-connect: 1
-socket: arg0 == AF_UNIX
-getpid: 1
-gettid: 1
-nanosleep: 1
-restart_syscall: 1
-set_tid_address: 1
-open: 1
-exit: 1
-sched_getscheduler: 1
-exit_group: 1
-sigaltstack: 1
-clone: 1
-rt_sigreturn: 1
-setpriority: 1
-getpriority: 1
-timer_create: 1
-timer_delete: 1
-timer_settime: 1
-rt_sigtimedwait: 1
-getdents64: 1
-dup: 1
-lseek: 1
-tgkill: 1
-process_vm_readv: 1
-memfd_create: 1
-eventfd2: 1
-epoll_create1: 1
-epoll_ctl: 1
-recvfrom: 1
-epoll_pwait: 1
diff --git a/proprietary/system_ext/etc/wfdconfigsink.xml b/proprietary/system_ext/etc/wfdconfigsink.xml
deleted file mode 100644
index e792b1d..0000000
--- a/proprietary/system_ext/etc/wfdconfigsink.xml
+++ /dev/null
@@ -1,822 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-    <!--
-        Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
-        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>60</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>60</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>60</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>60</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>60</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>60</VideoFps>
-                <TranscodingMode>1</TranscodingMode>
-                <NonTranscodingMode>1</NonTranscodingMode>
-            </VideoCodec6>
-
-            <VideoCodec7>
-                <CodecName>H.265</CodecName>
-                <Profile>0</Profile>
-                <Level>4</Level>
-                <HorizontalResolution>4096</HorizontalResolution>
-                <VerticalResolution>2160</VerticalResolution>
-                <Latency>0</Latency>
-                <MinimumSliceSize>0</MinimumSliceSize>
-                <SliceEncodingParams>0</SliceEncodingParams>
-                <FrameRateControlSupp>1</FrameRateControlSupp>
-                <VideoFps>60</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.sys.debug.rtp.enable_dump to 1
-                 /sdcard/Download/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
-                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>
-                <!--  Supported HIDC input events  -->
-                <CustomHIDCInputPaths>
-                    <Infrared>0</Infrared>
-                    <USB>3</USB>
-                    <BT>0</BT>
-                    <Zigbee>0</Zigbee>
-                    <Wifi>0</Wifi>
-                    <NoSP>0</NoSP>
-                </CustomHIDCInputPaths>
-            </InputEvents>
-            <!--  TCP port on which UIBC connection established -->
-            <TcpPort>4321</TcpPort>
-            <!-- 0/1 - support Custome HIDC or not -->
-            <CustomAppUIBCSupport>0</CustomAppUIBCSupport>
-        </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>7000000</MinBitrate>
-                <MaxBitrate>13000000</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>
-
-    <!--
-        Push video frames to display in async mode, so that display can drop frames
-        if frames are pushed faster than vsync.
-    -->
-    <PushVideoFrameInASyncMode>0</PushVideoFrameInASyncMode>
-
-    <!--
-        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>
-
-    <!--
-        Video Decoder Input Custom Limit Buffer Size Mode
-    -->
-    <VideoCustomSizeMode>1</VideoCustomSizeMode>
-
-</WFDConfig>
diff --git a/proprietary/system_ext/lib64/libmmrtpdecoder.so b/proprietary/system_ext/lib64/libmmrtpdecoder.so
deleted file mode 100644
index 43dd0d5..0000000
Binary files a/proprietary/system_ext/lib64/libmmrtpdecoder.so and /dev/null differ
diff --git a/proprietary/system_ext/lib64/libmmrtpencoder.so b/proprietary/system_ext/lib64/libmmrtpencoder.so
deleted file mode 100644
index 092844b..0000000
Binary files a/proprietary/system_ext/lib64/libmmrtpencoder.so and /dev/null differ
diff --git a/proprietary/system_ext/lib64/libwfdavenhancements.so b/proprietary/system_ext/lib64/libwfdavenhancements.so
deleted file mode 100644
index aaf59a0..0000000
Binary files a/proprietary/system_ext/lib64/libwfdavenhancements.so and /dev/null differ
diff --git a/proprietary/system_ext/lib64/libwfdclient.so b/proprietary/system_ext/lib64/libwfdclient.so
deleted file mode 100644
index a7020fc..0000000
Binary files a/proprietary/system_ext/lib64/libwfdclient.so and /dev/null differ
diff --git a/proprietary/system_ext/lib64/libwfdcommonutils.so b/proprietary/system_ext/lib64/libwfdcommonutils.so
deleted file mode 100644
index 8eafa81..0000000
Binary files a/proprietary/system_ext/lib64/libwfdcommonutils.so and /dev/null differ
diff --git a/proprietary/system_ext/lib64/libwfdconfigutils.so b/proprietary/system_ext/lib64/libwfdconfigutils.so
deleted file mode 100644
index f6f69fa..0000000
Binary files a/proprietary/system_ext/lib64/libwfdconfigutils.so and /dev/null differ
diff --git a/proprietary/system_ext/lib64/libwfddisplayconfig.so b/proprietary/system_ext/lib64/libwfddisplayconfig.so
deleted file mode 100644
index 2f40cc8..0000000
Binary files a/proprietary/system_ext/lib64/libwfddisplayconfig.so and /dev/null differ
diff --git a/proprietary/system_ext/lib64/libwfdmminterface.so b/proprietary/system_ext/lib64/libwfdmminterface.so
deleted file mode 100644
index 8e3110e..0000000
Binary files a/proprietary/system_ext/lib64/libwfdmminterface.so and /dev/null differ
diff --git a/proprietary/system_ext/lib64/libwfdmmsink.so b/proprietary/system_ext/lib64/libwfdmmsink.so
deleted file mode 100644
index 4b182cd..0000000
Binary files a/proprietary/system_ext/lib64/libwfdmmsink.so and /dev/null differ
diff --git a/proprietary/system_ext/lib64/libwfdmmsrc_system.so b/proprietary/system_ext/lib64/libwfdmmsrc_system.so
deleted file mode 100644
index 1ea216f..0000000
Binary files a/proprietary/system_ext/lib64/libwfdmmsrc_system.so and /dev/null differ
diff --git a/proprietary/system_ext/lib64/libwfdnative.so b/proprietary/system_ext/lib64/libwfdnative.so
deleted file mode 100644
index 9cf426d..0000000
Binary files a/proprietary/system_ext/lib64/libwfdnative.so and /dev/null differ
diff --git a/proprietary/system_ext/lib64/libwfdrtsp.so b/proprietary/system_ext/lib64/libwfdrtsp.so
deleted file mode 100644
index e472f56..0000000
Binary files a/proprietary/system_ext/lib64/libwfdrtsp.so and /dev/null differ
diff --git a/proprietary/system_ext/lib64/libwfdservice.so b/proprietary/system_ext/lib64/libwfdservice.so
deleted file mode 100644
index 127a227..0000000
Binary files a/proprietary/system_ext/lib64/libwfdservice.so and /dev/null differ
diff --git a/proprietary/system_ext/lib64/libwfdsinksm.so b/proprietary/system_ext/lib64/libwfdsinksm.so
deleted file mode 100644
index f50a531..0000000
Binary files a/proprietary/system_ext/lib64/libwfdsinksm.so and /dev/null differ
diff --git a/proprietary/system_ext/lib64/libwfduibcinterface.so b/proprietary/system_ext/lib64/libwfduibcinterface.so
deleted file mode 100644
index 4f810e7..0000000
Binary files a/proprietary/system_ext/lib64/libwfduibcinterface.so and /dev/null differ
diff --git a/proprietary/system_ext/lib64/libwfduibcsink.so b/proprietary/system_ext/lib64/libwfduibcsink.so
deleted file mode 100644
index 8b0b41b..0000000
Binary files a/proprietary/system_ext/lib64/libwfduibcsink.so and /dev/null differ
diff --git a/proprietary/system_ext/lib64/libwfduibcsinkinterface.so b/proprietary/system_ext/lib64/libwfduibcsinkinterface.so
deleted file mode 100644
index 91decf7..0000000
Binary files a/proprietary/system_ext/lib64/libwfduibcsinkinterface.so and /dev/null differ
diff --git a/proprietary/system_ext/lib64/libwfduibcsrc.so b/proprietary/system_ext/lib64/libwfduibcsrc.so
deleted file mode 100644
index 1989161..0000000
Binary files a/proprietary/system_ext/lib64/libwfduibcsrc.so and /dev/null differ
diff --git a/proprietary/system_ext/lib64/libwfduibcsrcinterface.so b/proprietary/system_ext/lib64/libwfduibcsrcinterface.so
deleted file mode 100644
index 33e3eb0..0000000
Binary files a/proprietary/system_ext/lib64/libwfduibcsrcinterface.so and /dev/null differ
diff --git a/proprietary/system_ext/lib64/vendor.qti.hardware.wifidisplaysession@1.0.so b/proprietary/system_ext/lib64/vendor.qti.hardware.wifidisplaysession@1.0.so
deleted file mode 100644
index c04e005..0000000
Binary files a/proprietary/system_ext/lib64/vendor.qti.hardware.wifidisplaysession@1.0.so and /dev/null differ
diff --git a/proprietary/system_ext/lib64/vendor.qti.hardware.wifidisplaysession_aidl-V1-ndk.so b/proprietary/system_ext/lib64/vendor.qti.hardware.wifidisplaysession_aidl-V1-ndk.so
deleted file mode 100644
index bc46c96..0000000
Binary files a/proprietary/system_ext/lib64/vendor.qti.hardware.wifidisplaysession_aidl-V1-ndk.so and /dev/null differ
diff --git a/proprietary/system_ext/priv-app/WfdService/WfdService.apk b/proprietary/system_ext/priv-app/WfdService/WfdService.apk
deleted file mode 100644
index 5c3ce6b..0000000
Binary files a/proprietary/system_ext/priv-app/WfdService/WfdService.apk and /dev/null differ
diff --git a/sm6375-common-vendor.mk b/sm6375-common-vendor.mk
index e745295..9043128 100644
--- a/sm6375-common-vendor.mk
+++ b/sm6375-common-vendor.mk
@@ -13,7 +13,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/sm6375-common/proprietary/system/etc/sysconfig/qti_whitelist.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/qti_whitelist.xml \
     vendor/motorola/sm6375-common/proprietary/system_ext/etc/dpm/dpm.conf:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/dpm/dpm.conf \
     vendor/motorola/sm6375-common/proprietary/system_ext/etc/init/dpmd.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/dpmd.rc \
-    vendor/motorola/sm6375-common/proprietary/system_ext/etc/init/wfdservice.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/wfdservice.rc \
     vendor/motorola/sm6375-common/proprietary/system_ext/etc/permissions/com.qti.dpmframework.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.qti.dpmframework.xml \
     vendor/motorola/sm6375-common/proprietary/system_ext/etc/permissions/dpmapi.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/dpmapi.xml \
     vendor/motorola/sm6375-common/proprietary/system_ext/etc/permissions/moto-telephony.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/moto-telephony.xml \
@@ -22,10 +21,7 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/sm6375-common/proprietary/system_ext/etc/permissions/qti_permissions.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/qti_permissions.xml \
     vendor/motorola/sm6375-common/proprietary/system_ext/etc/permissions/telephony_system-ext_privapp-permissions-qti.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/telephony_system-ext_privapp-permissions-qti.xml \
     vendor/motorola/sm6375-common/proprietary/system_ext/etc/permissions/vendor.qti.ims.rcsservice.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/vendor.qti.ims.rcsservice.xml \
-    vendor/motorola/sm6375-common/proprietary/system_ext/etc/permissions/wfd-system-ext-privapp-permissions-qti.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/wfd-system-ext-privapp-permissions-qti.xml \
-    vendor/motorola/sm6375-common/proprietary/system_ext/etc/seccomp_policy/wfdservice64.policy:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/seccomp_policy/wfdservice64.policy \
     vendor/motorola/sm6375-common/proprietary/system_ext/etc/sysconfig/qti_telephony_system_packages_config.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/sysconfig/qti_telephony_system_packages_config.xml \
-    vendor/motorola/sm6375-common/proprietary/system_ext/etc/wfdconfigsink.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/wfdconfigsink.xml \
     vendor/motorola/sm6375-common/proprietary/vendor/etc/ArmHDCP_QTI_Android.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/ArmHDCP_QTI_Android.cfg \
     vendor/motorola/sm6375-common/proprietary/vendor/etc/charger_fstab.qti:$(TARGET_COPY_OUT_VENDOR)/etc/charger_fstab.qti \
     vendor/motorola/sm6375-common/proprietary/vendor/etc/cne/mwqem.conf:$(TARGET_COPY_OUT_VENDOR)/etc/cne/mwqem.conf \
@@ -608,30 +604,9 @@ PRODUCT_PACKAGES += \
     libimsmedia_jni \
     libmmosal \
     libmmparser_lite \
-    libmmrtpdecoder \
-    libmmrtpencoder \
-    libwfdavenhancements \
-    libwfdclient \
-    libwfdcommonutils \
-    libwfdconfigutils \
-    libwfddisplayconfig \
-    libwfdmminterface \
-    libwfdmmsink \
-    libwfdmmsrc_system \
-    libwfdnative \
-    libwfdrtsp \
-    libwfdservice \
-    libwfdsinksm \
-    libwfduibcinterface \
-    libwfduibcsink \
-    libwfduibcsinkinterface \
-    libwfduibcsrc \
-    libwfduibcsrcinterface \
     vendor.qti.ImsRtpService-V1-ndk \
     vendor.qti.diaghal-V1-ndk \
     vendor.qti.diaghal@1.0 \
-    vendor.qti.hardware.wifidisplaysession@1.0 \
-    vendor.qti.hardware.wifidisplaysession_aidl-V1-ndk \
     vendor.qti.imsrtpservice@3.0 \
     vendor.qti.imsrtpservice@3.1 \
     CACertService \
@@ -642,11 +617,9 @@ PRODUCT_PACKAGES += \
     ImsRcsService \
     QtiTelephonyService \
     QtiTelephony \
-    WfdService \
     dpmserviceapp \
     ims \
     qcrilmsgtunnel \
-    WfdCommon \
     uimgbalibrary \
     uimgbamanagerlibrary \
     uimservicelibrary \
@@ -736,13 +709,11 @@ PRODUCT_PACKAGES += \
     wfdvndservice \
     wifidisplayhalservice \
     xtra-daemon \
-    dpmd \
-    wfdservice
+    dpmd
 
 PRODUCT_PACKAGES += \
     system_ext_priv-app_ims_lib_arm64_libimscamera_jni_so \
     system_ext_priv-app_ims_lib_arm64_libimsmedia_jni_so \
-    system_ext_priv-app_WfdService_lib_arm64_libwfdnative_so \
     vendor_bin_expat \
     vendor_lib_libEGL_adreno_so \
     vendor_lib_libGLESv2_adreno_so \
@@ -753,9 +724,6 @@ PRODUCT_PACKAGES += \
     vendor_lib64_libGLESv2_adreno_so \
     vendor_lib64_libq3dtools_adreno_so
 
-PRODUCT_BOOT_JARS += \
-    WfdCommon
-
 ifeq ($(TARGET_HAS_FM),true)
 
 PRODUCT_PACKAGES += \