diff --git a/Android.bp b/Android.bp
index 9af843e..c36407e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1207,23 +1207,6 @@ cc_prebuilt_library_shared {
 	soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-	name: "libFileMux_proprietary",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/libFileMux_proprietary.so"],
-		},
-	},
-	compile_multilib: "32",
-	check_elf_files: false,
-	prefer: true,
-	soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
 	name: "libMpeg4SwEncoder",
 	owner: "xiaomi",
@@ -1615,40 +1598,6 @@ cc_prebuilt_library_shared {
 	soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-	name: "libmmrtpdecoder_proprietary",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/libmmrtpdecoder_proprietary.so"],
-		},
-	},
-	compile_multilib: "32",
-	check_elf_files: false,
-	prefer: true,
-	soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libmmrtpencoder_proprietary",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/libmmrtpencoder_proprietary.so"],
-		},
-	},
-	compile_multilib: "32",
-	check_elf_files: false,
-	prefer: true,
-	soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
 	name: "libmulawdec",
 	owner: "xiaomi",
@@ -1768,346 +1717,6 @@ cc_prebuilt_library_shared {
 	soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-	name: "libwfdcodecv4l2_proprietary",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/libwfdcodecv4l2_proprietary.so"],
-		},
-	},
-	compile_multilib: "32",
-	check_elf_files: false,
-	prefer: true,
-	soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libwfdcommonutils_proprietary",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/libwfdcommonutils_proprietary.so"],
-		},
-	},
-	compile_multilib: "32",
-	check_elf_files: false,
-	prefer: true,
-	soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libwfdconfigutils_proprietary",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/libwfdconfigutils_proprietary.so"],
-		},
-	},
-	compile_multilib: "32",
-	check_elf_files: false,
-	prefer: true,
-	soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libwfddisplayconfig_proprietary",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/libwfddisplayconfig_proprietary.so"],
-		},
-	},
-	compile_multilib: "32",
-	check_elf_files: false,
-	prefer: true,
-	soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libwfdhdcpcp",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/libwfdhdcpcp.so"],
-		},
-	},
-	compile_multilib: "32",
-	check_elf_files: false,
-	prefer: true,
-	soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libwfdhdcpservice_proprietary",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/libwfdhdcpservice_proprietary.so"],
-		},
-	},
-	compile_multilib: "32",
-	check_elf_files: false,
-	prefer: true,
-	soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libwfdmminterface_proprietary",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/libwfdmminterface_proprietary.so"],
-		},
-	},
-	compile_multilib: "32",
-	check_elf_files: false,
-	prefer: true,
-	soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libwfdmmservice_proprietary",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/libwfdmmservice_proprietary.so"],
-		},
-	},
-	compile_multilib: "32",
-	check_elf_files: false,
-	prefer: true,
-	soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libwfdmmsrc_proprietary",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/libwfdmmsrc_proprietary.so"],
-		},
-	},
-	compile_multilib: "32",
-	check_elf_files: false,
-	prefer: true,
-	soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libwfdmodulehdcpsession",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/libwfdmodulehdcpsession.so"],
-		},
-	},
-	compile_multilib: "32",
-	check_elf_files: false,
-	prefer: true,
-	soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libwfdrtsp_proprietary",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/libwfdrtsp_proprietary.so"],
-		},
-	},
-	compile_multilib: "32",
-	check_elf_files: false,
-	prefer: true,
-	soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libwfdsessionmodule",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/libwfdsessionmodule.so"],
-		},
-	},
-	compile_multilib: "32",
-	check_elf_files: false,
-	prefer: true,
-	soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libwfdsourcesession_proprietary",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/libwfdsourcesession_proprietary.so"],
-		},
-	},
-	compile_multilib: "32",
-	check_elf_files: false,
-	prefer: true,
-	soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libwfdsourcesm_proprietary",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/libwfdsourcesm_proprietary.so"],
-		},
-	},
-	compile_multilib: "32",
-	check_elf_files: false,
-	prefer: true,
-	soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libwfduibcinterface_proprietary",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/libwfduibcinterface_proprietary.so"],
-		},
-	},
-	compile_multilib: "32",
-	check_elf_files: false,
-	prefer: true,
-	soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libwfduibcsink_proprietary",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/libwfduibcsink_proprietary.so"],
-		},
-	},
-	compile_multilib: "32",
-	check_elf_files: false,
-	prefer: true,
-	soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libwfduibcsinkinterface_proprietary",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/libwfduibcsinkinterface_proprietary.so"],
-		},
-	},
-	compile_multilib: "32",
-	check_elf_files: false,
-	prefer: true,
-	soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libwfduibcsrc_proprietary",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/libwfduibcsrc_proprietary.so"],
-		},
-	},
-	compile_multilib: "32",
-	check_elf_files: false,
-	prefer: true,
-	soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libwfduibcsrcinterface_proprietary",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/libwfduibcsrcinterface_proprietary.so"],
-		},
-	},
-	compile_multilib: "32",
-	check_elf_files: false,
-	prefer: true,
-	soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libwfdutils_proprietary",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/libwfdutils_proprietary.so"],
-		},
-	},
-	compile_multilib: "32",
-	check_elf_files: false,
-	prefer: true,
-	soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
 	name: "libmisoundfx",
 	owner: "xiaomi",
@@ -2144,41 +1753,6 @@ cc_prebuilt_library_shared {
 	soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-	name: "vendor.qti.hardware.wifidisplaysession@1.0_vendor",
-	stem: "vendor.qti.hardware.wifidisplaysession@1.0",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/vendor.qti.hardware.wifidisplaysession@1.0.so"],
-		},
-	},
-	compile_multilib: "32",
-	check_elf_files: false,
-	prefer: true,
-	soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl.so"],
-		},
-	},
-	compile_multilib: "32",
-	check_elf_files: false,
-	prefer: true,
-	soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
 	name: "android.hardware.camera.provider@2.4-legacy",
 	owner: "xiaomi",
@@ -8628,431 +8202,6 @@ prebuilt_rfsa {
 	soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-	name: "libmmosal",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/system_ext/lib/libmmosal.so"],
-		},
-		android_arm64: {
-			srcs: ["proprietary/system_ext/lib64/libmmosal.so"],
-		},
-	},
-	compile_multilib: "both",
-	check_elf_files: false,
-	prefer: true,
-	system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libmmparser_lite",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/system_ext/lib/libmmparser_lite.so"],
-		},
-		android_arm64: {
-			srcs: ["proprietary/system_ext/lib64/libmmparser_lite.so"],
-		},
-	},
-	compile_multilib: "both",
-	check_elf_files: false,
-	prefer: true,
-	system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libmmrtpdecoder",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/system_ext/lib/libmmrtpdecoder.so"],
-		},
-		android_arm64: {
-			srcs: ["proprietary/system_ext/lib64/libmmrtpdecoder.so"],
-		},
-	},
-	compile_multilib: "both",
-	check_elf_files: false,
-	prefer: true,
-	system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libmmrtpencoder",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/system_ext/lib/libmmrtpencoder.so"],
-		},
-		android_arm64: {
-			srcs: ["proprietary/system_ext/lib64/libmmrtpencoder.so"],
-		},
-	},
-	compile_multilib: "both",
-	check_elf_files: false,
-	prefer: true,
-	system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libwfdclient",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/system_ext/lib/libwfdclient.so"],
-		},
-		android_arm64: {
-			srcs: ["proprietary/system_ext/lib64/libwfdclient.so"],
-		},
-	},
-	compile_multilib: "both",
-	check_elf_files: false,
-	prefer: true,
-	system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libwfdcommonutils",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/system_ext/lib/libwfdcommonutils.so"],
-		},
-		android_arm64: {
-			srcs: ["proprietary/system_ext/lib64/libwfdcommonutils.so"],
-		},
-	},
-	compile_multilib: "both",
-	check_elf_files: false,
-	prefer: true,
-	system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libwfdconfigutils",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/system_ext/lib/libwfdconfigutils.so"],
-		},
-		android_arm64: {
-			srcs: ["proprietary/system_ext/lib64/libwfdconfigutils.so"],
-		},
-	},
-	compile_multilib: "both",
-	check_elf_files: false,
-	prefer: true,
-	system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libwfddisplayconfig",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/system_ext/lib/libwfddisplayconfig.so"],
-		},
-		android_arm64: {
-			srcs: ["proprietary/system_ext/lib64/libwfddisplayconfig.so"],
-		},
-	},
-	compile_multilib: "both",
-	check_elf_files: false,
-	prefer: true,
-	system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libwfdmminterface",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/system_ext/lib/libwfdmminterface.so"],
-		},
-		android_arm64: {
-			srcs: ["proprietary/system_ext/lib64/libwfdmminterface.so"],
-		},
-	},
-	compile_multilib: "both",
-	check_elf_files: false,
-	prefer: true,
-	system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libwfdmmsink",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/system_ext/lib/libwfdmmsink.so"],
-		},
-		android_arm64: {
-			srcs: ["proprietary/system_ext/lib64/libwfdmmsink.so"],
-		},
-	},
-	compile_multilib: "both",
-	check_elf_files: false,
-	prefer: true,
-	system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libwfdrtsp",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/system_ext/lib/libwfdrtsp.so"],
-		},
-		android_arm64: {
-			srcs: ["proprietary/system_ext/lib64/libwfdrtsp.so"],
-		},
-	},
-	compile_multilib: "both",
-	check_elf_files: false,
-	prefer: true,
-	system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libwfdsinksm",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/system_ext/lib/libwfdsinksm.so"],
-		},
-		android_arm64: {
-			srcs: ["proprietary/system_ext/lib64/libwfdsinksm.so"],
-		},
-	},
-	compile_multilib: "both",
-	check_elf_files: false,
-	prefer: true,
-	system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libwfduibcinterface",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/system_ext/lib/libwfduibcinterface.so"],
-		},
-		android_arm64: {
-			srcs: ["proprietary/system_ext/lib64/libwfduibcinterface.so"],
-		},
-	},
-	compile_multilib: "both",
-	check_elf_files: false,
-	prefer: true,
-	system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libwfduibcsink",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/system_ext/lib/libwfduibcsink.so"],
-		},
-		android_arm64: {
-			srcs: ["proprietary/system_ext/lib64/libwfduibcsink.so"],
-		},
-	},
-	compile_multilib: "both",
-	check_elf_files: false,
-	prefer: true,
-	system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libwfduibcsinkinterface",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/system_ext/lib/libwfduibcsinkinterface.so"],
-		},
-		android_arm64: {
-			srcs: ["proprietary/system_ext/lib64/libwfduibcsinkinterface.so"],
-		},
-	},
-	compile_multilib: "both",
-	check_elf_files: false,
-	prefer: true,
-	system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libwfduibcsrc",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/system_ext/lib/libwfduibcsrc.so"],
-		},
-		android_arm64: {
-			srcs: ["proprietary/system_ext/lib64/libwfduibcsrc.so"],
-		},
-	},
-	compile_multilib: "both",
-	check_elf_files: false,
-	prefer: true,
-	system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libwfduibcsrcinterface",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/system_ext/lib/libwfduibcsrcinterface.so"],
-		},
-		android_arm64: {
-			srcs: ["proprietary/system_ext/lib64/libwfduibcsrcinterface.so"],
-		},
-	},
-	compile_multilib: "both",
-	check_elf_files: false,
-	prefer: true,
-	system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "com.qualcomm.qti.wifidisplayhal@1.0",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/system_ext/lib/com.qualcomm.qti.wifidisplayhal@1.0.so"],
-		},
-	},
-	compile_multilib: "32",
-	check_elf_files: false,
-	prefer: true,
-	system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libwfdavenhancements",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/system_ext/lib/libwfdavenhancements.so"],
-		},
-	},
-	compile_multilib: "32",
-	check_elf_files: false,
-	prefer: true,
-	system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libwfdmmsrc_system",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/system_ext/lib/libwfdmmsrc_system.so"],
-		},
-	},
-	compile_multilib: "32",
-	check_elf_files: false,
-	prefer: true,
-	system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libwfdservice",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/system_ext/lib/libwfdservice.so"],
-		},
-	},
-	compile_multilib: "32",
-	check_elf_files: false,
-	prefer: true,
-	system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "vendor.qti.hardware.wifidisplaysession@1.0",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/system_ext/lib/vendor.qti.hardware.wifidisplaysession@1.0.so"],
-		},
-	},
-	compile_multilib: "32",
-	check_elf_files: false,
-	prefer: true,
-	system_ext_specific: true,
-}
-
 cc_prebuilt_library_shared {
 	name: "com.qualcomm.qti.dpm.api@1.0_system_ext",
 	stem: "com.qualcomm.qti.dpm.api@1.0",
@@ -9292,23 +8441,6 @@ cc_prebuilt_library_shared {
 	system_ext_specific: true,
 }
 
-cc_prebuilt_library_shared {
-	name: "libwfdnative",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm64: {
-			srcs: ["proprietary/system_ext/lib64/libwfdnative.so"],
-		},
-	},
-	compile_multilib: "64",
-	check_elf_files: false,
-	prefer: true,
-	system_ext_specific: true,
-}
-
 cc_prebuilt_library_shared {
 	name: "vendor.qti.diaghal@1.0",
 	owner: "xiaomi",
@@ -9439,18 +8571,6 @@ android_app_import {
 	system_ext_specific: true,
 }
 
-android_app_import {
-	name: "WfdService",
-	owner: "xiaomi",
-	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: "xiaomi",
@@ -9487,12 +8607,6 @@ android_app_import {
 	system_ext_specific: true,
 }
 
-dex_import {
-	name: "WfdCommon",
-	owner: "xiaomi",
-	jars: ["proprietary/system/framework/WfdCommon.jar"],
-}
-
 dex_import {
 	name: "tcmclient",
 	owner: "xiaomi",
@@ -10290,40 +9404,6 @@ cc_prebuilt_binary {
 	soc_specific: true,
 }
 
-cc_prebuilt_binary {
-	name: "wfdvndservice",
-	owner: "xiaomi",
-	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/bin/wfdvndservice"],
-		},
-	},
-	compile_multilib: "32",
-	check_elf_files: false,
-	strip: {
-		none: true,
-	},
-	prefer: true,
-	soc_specific: true,
-}
-
-cc_prebuilt_binary {
-	name: "wifidisplayhalservice",
-	owner: "xiaomi",
-	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/bin/wifidisplayhalservice"],
-		},
-	},
-	compile_multilib: "32",
-	check_elf_files: false,
-	strip: {
-		none: true,
-	},
-	prefer: true,
-	soc_specific: true,
-}
-
 cc_prebuilt_binary {
 	name: "xtra-daemon",
 	owner: "xiaomi",
@@ -10358,20 +9438,3 @@ cc_prebuilt_binary {
 	system_ext_specific: true,
 }
 
-cc_prebuilt_binary {
-	name: "wfdservice",
-	owner: "xiaomi",
-	target: {
-		android_arm: {
-			srcs: ["proprietary/system_ext/bin/wfdservice"],
-		},
-	},
-	compile_multilib: "32",
-	check_elf_files: false,
-	strip: {
-		none: true,
-	},
-	prefer: true,
-	system_ext_specific: true,
-}
-
diff --git a/proprietary/system/framework/WfdCommon.jar b/proprietary/system/framework/WfdCommon.jar
deleted file mode 100644
index 9640c50..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 76ecdac..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/seccomp_policy/wfdservice.policy b/proprietary/system_ext/etc/seccomp_policy/wfdservice.policy
deleted file mode 100644
index 09d5a83..0000000
--- a/proprietary/system_ext/etc/seccomp_policy/wfdservice.policy
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright (c) 2020-2021 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.
-
-mmap2: 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
-fstat64: 1
-readlinkat: 1
-pread64: 1
-fstatfs64: 1
-clock_gettime: 1
-fstatat64: 1
-read: 1
-write: 1
-fcntl64: 1
-ppoll: 1
-faccessat: 1
-rt_sigaction: 1
-getuid32: 1
-madvise: 1
-rt_sigprocmask: 1
-writev: 1
-personality: 1
-getrandom: 1
-gettimeofday: 1
-#set_tls: 1
-statfs64: 1
-ugetrlimit: 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
diff --git a/proprietary/system_ext/etc/wfdconfigsink.xml b/proprietary/system_ext/etc/wfdconfigsink.xml
deleted file mode 100644
index 6f5a2af..0000000
--- a/proprietary/system_ext/etc/wfdconfigsink.xml
+++ /dev/null
@@ -1,811 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-    <!--
-        Copyright (C) 2012 - 2021 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>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>
-            </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>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/lib/com.qualcomm.qti.wifidisplayhal@1.0.so b/proprietary/system_ext/lib/com.qualcomm.qti.wifidisplayhal@1.0.so
deleted file mode 100644
index 8aaa5f6..0000000
Binary files a/proprietary/system_ext/lib/com.qualcomm.qti.wifidisplayhal@1.0.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/libmmosal.so b/proprietary/system_ext/lib/libmmosal.so
deleted file mode 100644
index b41c773..0000000
Binary files a/proprietary/system_ext/lib/libmmosal.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/libmmparser_lite.so b/proprietary/system_ext/lib/libmmparser_lite.so
deleted file mode 100644
index 1392616..0000000
Binary files a/proprietary/system_ext/lib/libmmparser_lite.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/libmmrtpdecoder.so b/proprietary/system_ext/lib/libmmrtpdecoder.so
deleted file mode 100644
index de0cbbd..0000000
Binary files a/proprietary/system_ext/lib/libmmrtpdecoder.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/libmmrtpencoder.so b/proprietary/system_ext/lib/libmmrtpencoder.so
deleted file mode 100644
index 5adeb59..0000000
Binary files a/proprietary/system_ext/lib/libmmrtpencoder.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/libwfdavenhancements.so b/proprietary/system_ext/lib/libwfdavenhancements.so
deleted file mode 100644
index b2bdcd9..0000000
Binary files a/proprietary/system_ext/lib/libwfdavenhancements.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/libwfdclient.so b/proprietary/system_ext/lib/libwfdclient.so
deleted file mode 100644
index f03a083..0000000
Binary files a/proprietary/system_ext/lib/libwfdclient.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/libwfdcommonutils.so b/proprietary/system_ext/lib/libwfdcommonutils.so
deleted file mode 100644
index 69dc844..0000000
Binary files a/proprietary/system_ext/lib/libwfdcommonutils.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/libwfdconfigutils.so b/proprietary/system_ext/lib/libwfdconfigutils.so
deleted file mode 100644
index ed25f90..0000000
Binary files a/proprietary/system_ext/lib/libwfdconfigutils.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/libwfddisplayconfig.so b/proprietary/system_ext/lib/libwfddisplayconfig.so
deleted file mode 100644
index 6cf67fd..0000000
Binary files a/proprietary/system_ext/lib/libwfddisplayconfig.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/libwfdmminterface.so b/proprietary/system_ext/lib/libwfdmminterface.so
deleted file mode 100644
index 9fc01bf..0000000
Binary files a/proprietary/system_ext/lib/libwfdmminterface.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/libwfdmmsink.so b/proprietary/system_ext/lib/libwfdmmsink.so
deleted file mode 100644
index 8855ea4..0000000
Binary files a/proprietary/system_ext/lib/libwfdmmsink.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/libwfdmmsrc_system.so b/proprietary/system_ext/lib/libwfdmmsrc_system.so
deleted file mode 100644
index 437b794..0000000
Binary files a/proprietary/system_ext/lib/libwfdmmsrc_system.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/libwfdrtsp.so b/proprietary/system_ext/lib/libwfdrtsp.so
deleted file mode 100644
index cf190f3..0000000
Binary files a/proprietary/system_ext/lib/libwfdrtsp.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/libwfdservice.so b/proprietary/system_ext/lib/libwfdservice.so
deleted file mode 100644
index f77a006..0000000
Binary files a/proprietary/system_ext/lib/libwfdservice.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/libwfdsinksm.so b/proprietary/system_ext/lib/libwfdsinksm.so
deleted file mode 100644
index cdd0268..0000000
Binary files a/proprietary/system_ext/lib/libwfdsinksm.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/libwfduibcinterface.so b/proprietary/system_ext/lib/libwfduibcinterface.so
deleted file mode 100644
index 92699f4..0000000
Binary files a/proprietary/system_ext/lib/libwfduibcinterface.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/libwfduibcsink.so b/proprietary/system_ext/lib/libwfduibcsink.so
deleted file mode 100644
index 5898d12..0000000
Binary files a/proprietary/system_ext/lib/libwfduibcsink.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/libwfduibcsinkinterface.so b/proprietary/system_ext/lib/libwfduibcsinkinterface.so
deleted file mode 100644
index 110b830..0000000
Binary files a/proprietary/system_ext/lib/libwfduibcsinkinterface.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/libwfduibcsrc.so b/proprietary/system_ext/lib/libwfduibcsrc.so
deleted file mode 100644
index 9651d85..0000000
Binary files a/proprietary/system_ext/lib/libwfduibcsrc.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/libwfduibcsrcinterface.so b/proprietary/system_ext/lib/libwfduibcsrcinterface.so
deleted file mode 100644
index 63bc951..0000000
Binary files a/proprietary/system_ext/lib/libwfduibcsrcinterface.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/vendor.qti.hardware.wifidisplaysession@1.0.so b/proprietary/system_ext/lib/vendor.qti.hardware.wifidisplaysession@1.0.so
deleted file mode 100644
index b30a625..0000000
Binary files a/proprietary/system_ext/lib/vendor.qti.hardware.wifidisplaysession@1.0.so and /dev/null differ
diff --git a/proprietary/system_ext/lib64/libmmosal.so b/proprietary/system_ext/lib64/libmmosal.so
deleted file mode 100644
index e6e553c..0000000
Binary files a/proprietary/system_ext/lib64/libmmosal.so and /dev/null differ
diff --git a/proprietary/system_ext/lib64/libmmparser_lite.so b/proprietary/system_ext/lib64/libmmparser_lite.so
deleted file mode 100644
index ef3d5b2..0000000
Binary files a/proprietary/system_ext/lib64/libmmparser_lite.so and /dev/null differ
diff --git a/proprietary/system_ext/lib64/libmmrtpdecoder.so b/proprietary/system_ext/lib64/libmmrtpdecoder.so
deleted file mode 100644
index fdb529d..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 7505715..0000000
Binary files a/proprietary/system_ext/lib64/libmmrtpencoder.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 02147ce..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 cc9d53b..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 5663472..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 d587503..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 5bd734c..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 c274b6a..0000000
Binary files a/proprietary/system_ext/lib64/libwfdmmsink.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 09fad87..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 16cf3a1..0000000
Binary files a/proprietary/system_ext/lib64/libwfdrtsp.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 75c86bb..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 8fc7422..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 301b04f..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 83af361..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 f2d0ad2..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 9a7198a..0000000
Binary files a/proprietary/system_ext/lib64/libwfduibcsrcinterface.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 c54ade4..0000000
Binary files a/proprietary/system_ext/priv-app/WfdService/WfdService.apk and /dev/null differ
diff --git a/proprietary/vendor/bin/wfdvndservice b/proprietary/vendor/bin/wfdvndservice
deleted file mode 100755
index 1592ab9..0000000
Binary files a/proprietary/vendor/bin/wfdvndservice and /dev/null differ
diff --git a/proprietary/vendor/bin/wifidisplayhalservice b/proprietary/vendor/bin/wifidisplayhalservice
deleted file mode 100755
index b7e54a7..0000000
Binary files a/proprietary/vendor/bin/wifidisplayhalservice and /dev/null differ
diff --git a/proprietary/vendor/etc/init/com.qualcomm.qti.wifidisplayhal@1.0-service.rc b/proprietary/vendor/etc/init/com.qualcomm.qti.wifidisplayhal@1.0-service.rc
deleted file mode 100644
index 790837b..0000000
--- a/proprietary/vendor/etc/init/com.qualcomm.qti.wifidisplayhal@1.0-service.rc
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Copyright (c) 2019 Qualcomm Technologies, Inc.
-# All Rights Reserved.
-# Confidential and Proprietary - Qualcomm Technologies, Inc.
-#
-service wifidisplayhalservice /vendor/bin/wifidisplayhalservice
-  class main
-  user system
-  group inet input audio media uhid
-  capabilities NET_RAW
-
diff --git a/proprietary/vendor/etc/init/wfdvndservice.rc b/proprietary/vendor/etc/init/wfdvndservice.rc
deleted file mode 100644
index c28e32b..0000000
--- a/proprietary/vendor/etc/init/wfdvndservice.rc
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Copyright (c) 2019 Qualcomm Technologies, Inc.
-# All Rights Reserved.
-# Confidential and Proprietary - Qualcomm Technologies, Inc.
-#
-
-service wfdvndservice /vendor/bin/wfdvndservice
-  class main
-  user system
-  group inet
diff --git a/proprietary/vendor/etc/seccomp_policy/wfdhdcphalservice.policy b/proprietary/vendor/etc/seccomp_policy/wfdhdcphalservice.policy
deleted file mode 100644
index 5c48147..0000000
--- a/proprietary/vendor/etc/seccomp_policy/wfdhdcphalservice.policy
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright (c) 2020-2021 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.
-
-mmap2: arg2 in ~PROT_EXEC || arg2 in ~PROT_WRITE
-munmap: 1
-mprotect: arg2 in ~PROT_EXEC || arg2 in ~PROT_WRITE
-#prctl: arg0 == PR_GET_DUMPABLE || arg0 == PR_SET_VMA
-prctl: 1
-openat: 1
-futex: 1
-close: 1
-read: 1
-write: 1
-fstat64: 1
-fstatat64: 1
-readlinkat: 1
-fstatfs64: 1
-pread64: 1
-#ioctl: arg1 == BINDER_VERSION || arg1 == BINDER_SET_MAX_THREADS || arg1 == BINDER_WRITE_READ
-ioctl: 1
-faccessat: 1
-clock_gettime: 1
-getuid32: 1
-rt_sigaction: 1
-writev: 1
-madvise: 1
-_llseek: 1
-rt_sigprocmask: 1
-fcntl64: 1
-#set_tls: 1
-personality: 1
-getrandom: 1
-open: 1
-ugetrlimit: 1
-clone: 1
-set_tid_address: 1
-execve: 1
-sched_getscheduler: 1
-exit_group: 1
-rt_sigreturn: 1
-restart_syscall: 1
-connect: 1
-socket: arg0 == AF_UNIX
-exit: 1
-readlink: 1
-getpid: 1
-sigaltstack: 1
-setpriority: 1
-getdents64: 1
-dup: 1
-mremap:1
diff --git a/proprietary/vendor/etc/seccomp_policy/wfdvndservice.policy b/proprietary/vendor/etc/seccomp_policy/wfdvndservice.policy
deleted file mode 100644
index 591cf41..0000000
--- a/proprietary/vendor/etc/seccomp_policy/wfdvndservice.policy
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright (c) 2020 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.
-
-mmap2: arg2 in ~PROT_EXEC || arg2 in ~PROT_WRITE
-munmap: 1
-mprotect: arg2 in ~PROT_EXEC || arg2 in ~PROT_WRITE
-#prctl: arg0 == PR_SET_VMA || arg0 == PR_GET_DUMPABLE
-prctl: 1
-futex: 1
-openat: 1
-fstatat64: 1
-read: 1
-write: 1
-close: 1
-sendto: 1
-clock_gettime: 1
-fstat64: 1
-faccessat: 1
-readlinkat: 1
-pread64: 1
-fstatfs64: 1
-getuid32: 1
-rt_sigaction: 1
-#ioctl: arg1 == BINDER_WRITE_READ || arg1 == BINDER_VERSION || arg1 == BINDER_SET_MAX_THREADS
-ioctl: 1
-writev: 1
-rt_sigprocmask: 1
-madvise: 1
-fcntl64: 1
-clone: 1
-#set_tls: 1
-open: 1
-personality: 1
-getrandom: 1
-restart_syscall: 1
-sched_getscheduler: 1
-execve: 1
-socket: arg0 == AF_UNIX
-exit_group: 1
-rt_sigreturn: 1
-connect: 1
-set_tid_address: 1
-readlink: 1
-ugetrlimit: 1
-exit: 1
-getpid: 1
-gettid: 1
-sigaltstack: 1
-setpriority: 1
-lseek: 1
-sched_yield: 1
-_llseek: 1
-nanosleep: 1
-flock: 1
-setsockopt: 1
-bind: 1
-getsockname: 1
-listen: 1
-pselect6: 1
-accept4: 1
-sendmsg: 1
-recvfrom: 1
-mremap: 1
diff --git a/proprietary/vendor/etc/seccomp_policy/wifidisplayhalservice.policy b/proprietary/vendor/etc/seccomp_policy/wifidisplayhalservice.policy
deleted file mode 100644
index 5bb6994..0000000
--- a/proprietary/vendor/etc/seccomp_policy/wifidisplayhalservice.policy
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright (c) 2020 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.
-
-#ioctl: arg1 == BINDER_WRITE_READ || arg1 == BINDER_VERSION || arg1 == VIDIOC_QBUF || arg1 == BINDER_SET_MAX_THREADS
-ioctl: 1
-futex: 1
-mmap2: arg2 in ~PROT_EXEC || arg2 in ~PROT_WRITE
-clock_gettime: 1
-dup: 1
-munmap: 1
-mprotect: arg2 in ~PROT_EXEC || arg2 in ~PROT_WRITE
-#prctl: arg0 == PR_GET_DUMPABLE || arg0 == PR_SET_VMA
-prctl: 1
-openat: 1
-close: 1
-fstat64: 1
-read: 1
-write: 1
-readlinkat: 1
-unlinkat: 1
-mremap: 1
-pread64: 1
-fstatfs64: 1
-fstatat64: 1
-getuid32: 1
-writev: 1
-faccessat: 1
-rt_sigaction: 1
-sendto: 1
-_llseek: 1
-madvise: 1
-rt_sigprocmask: 1
-fcntl64: 1
-#set_tls: 1
-personality: 1
-getrandom: 1
-ugetrlimit: 1
-rt_sigreturn: 1
-set_tid_address: 1
-open: 1
-exit: 1
-sched_getscheduler: 1
-connect: 1
-execve: 1
-getpid: 1
-exit_group: 1
-socket: arg0 == AF_UNIX
-clone: 1
-restart_syscall: 1
-sigaltstack: 1
-setpriority: 1
-setsockopt: 1
-getsockopt: 1
-bind: 1
-listen: 1
-socketpair: 1
-getpriority: 1
-pselect6: 1
-accept4: 1
-sendmsg: 1
-sendmmsg: 1
-recvmsg: 1
-recvfrom: 1
-gettimeofday: 1
-lseek: 1
-getsockname: 1
-nanosleep: 1
-ppoll: 1
-timer_create: 1
-timer_delete: 1
-timer_settime: 1
-rt_sigtimedwait: 1
-eventfd2: 1
-tgkill: 1
-gettid: 1
-sched_yield: 1
-flock: 1
diff --git a/proprietary/vendor/etc/wfdconfig.xml b/proprietary/vendor/etc/wfdconfig.xml
deleted file mode 100644
index 0e5256d..0000000
--- a/proprietary/vendor/etc/wfdconfig.xml
+++ /dev/null
@@ -1,755 +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
-            -->
-
-            <!-- AVC Level  0 - 3.1,
-                            1 - 3.2,
-                            2 - 4.0,
-                            3 - 4.1,
-                            4 - 4.2,
-                            5 - 5,
-                            6 - 5.1,
-                            7 - 5.2
-
-                 HEVC Level 0 - 3.1,
-                            1 - 4,
-                            2 - 4.1,
-                            3 - 5,
-                            4 - 5.1
-            -->
-
-            <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>4</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
-                    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>7000000</MinBitrate>
-                <MaxBitrate>13000000</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>1</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/proprietary/vendor/lib/libFileMux_proprietary.so b/proprietary/vendor/lib/libFileMux_proprietary.so
deleted file mode 100644
index f6ed1b4..0000000
Binary files a/proprietary/vendor/lib/libFileMux_proprietary.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libmmrtpdecoder_proprietary.so b/proprietary/vendor/lib/libmmrtpdecoder_proprietary.so
deleted file mode 100644
index fc56cfa..0000000
Binary files a/proprietary/vendor/lib/libmmrtpdecoder_proprietary.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libmmrtpencoder_proprietary.so b/proprietary/vendor/lib/libmmrtpencoder_proprietary.so
deleted file mode 100644
index 7af226d..0000000
Binary files a/proprietary/vendor/lib/libmmrtpencoder_proprietary.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libwfdcodecv4l2_proprietary.so b/proprietary/vendor/lib/libwfdcodecv4l2_proprietary.so
deleted file mode 100644
index bc7994b..0000000
Binary files a/proprietary/vendor/lib/libwfdcodecv4l2_proprietary.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libwfdcommonutils_proprietary.so b/proprietary/vendor/lib/libwfdcommonutils_proprietary.so
deleted file mode 100644
index ca92fa8..0000000
Binary files a/proprietary/vendor/lib/libwfdcommonutils_proprietary.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libwfdconfigutils_proprietary.so b/proprietary/vendor/lib/libwfdconfigutils_proprietary.so
deleted file mode 100644
index 153eb63..0000000
Binary files a/proprietary/vendor/lib/libwfdconfigutils_proprietary.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libwfddisplayconfig_proprietary.so b/proprietary/vendor/lib/libwfddisplayconfig_proprietary.so
deleted file mode 100644
index e7da707..0000000
Binary files a/proprietary/vendor/lib/libwfddisplayconfig_proprietary.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libwfdhdcpcp.so b/proprietary/vendor/lib/libwfdhdcpcp.so
deleted file mode 100644
index e5c2669..0000000
Binary files a/proprietary/vendor/lib/libwfdhdcpcp.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libwfdhdcpservice_proprietary.so b/proprietary/vendor/lib/libwfdhdcpservice_proprietary.so
deleted file mode 100644
index 5b0ede4..0000000
Binary files a/proprietary/vendor/lib/libwfdhdcpservice_proprietary.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libwfdmminterface_proprietary.so b/proprietary/vendor/lib/libwfdmminterface_proprietary.so
deleted file mode 100644
index ae568af..0000000
Binary files a/proprietary/vendor/lib/libwfdmminterface_proprietary.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libwfdmmservice_proprietary.so b/proprietary/vendor/lib/libwfdmmservice_proprietary.so
deleted file mode 100644
index 9f07e30..0000000
Binary files a/proprietary/vendor/lib/libwfdmmservice_proprietary.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libwfdmmsrc_proprietary.so b/proprietary/vendor/lib/libwfdmmsrc_proprietary.so
deleted file mode 100644
index 474a367..0000000
Binary files a/proprietary/vendor/lib/libwfdmmsrc_proprietary.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libwfdmodulehdcpsession.so b/proprietary/vendor/lib/libwfdmodulehdcpsession.so
deleted file mode 100644
index 5624742..0000000
Binary files a/proprietary/vendor/lib/libwfdmodulehdcpsession.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libwfdrtsp_proprietary.so b/proprietary/vendor/lib/libwfdrtsp_proprietary.so
deleted file mode 100644
index 0a2d745..0000000
Binary files a/proprietary/vendor/lib/libwfdrtsp_proprietary.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libwfdsessionmodule.so b/proprietary/vendor/lib/libwfdsessionmodule.so
deleted file mode 100644
index fcbb24b..0000000
Binary files a/proprietary/vendor/lib/libwfdsessionmodule.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libwfdsourcesession_proprietary.so b/proprietary/vendor/lib/libwfdsourcesession_proprietary.so
deleted file mode 100644
index fc5c8e1..0000000
Binary files a/proprietary/vendor/lib/libwfdsourcesession_proprietary.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libwfdsourcesm_proprietary.so b/proprietary/vendor/lib/libwfdsourcesm_proprietary.so
deleted file mode 100644
index 50aefd1..0000000
Binary files a/proprietary/vendor/lib/libwfdsourcesm_proprietary.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libwfduibcinterface_proprietary.so b/proprietary/vendor/lib/libwfduibcinterface_proprietary.so
deleted file mode 100644
index 52e77f4..0000000
Binary files a/proprietary/vendor/lib/libwfduibcinterface_proprietary.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libwfduibcsink_proprietary.so b/proprietary/vendor/lib/libwfduibcsink_proprietary.so
deleted file mode 100644
index f909dcd..0000000
Binary files a/proprietary/vendor/lib/libwfduibcsink_proprietary.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libwfduibcsinkinterface_proprietary.so b/proprietary/vendor/lib/libwfduibcsinkinterface_proprietary.so
deleted file mode 100644
index a4e6353..0000000
Binary files a/proprietary/vendor/lib/libwfduibcsinkinterface_proprietary.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libwfduibcsrc_proprietary.so b/proprietary/vendor/lib/libwfduibcsrc_proprietary.so
deleted file mode 100644
index 9ce96e0..0000000
Binary files a/proprietary/vendor/lib/libwfduibcsrc_proprietary.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libwfduibcsrcinterface_proprietary.so b/proprietary/vendor/lib/libwfduibcsrcinterface_proprietary.so
deleted file mode 100644
index fe305ea..0000000
Binary files a/proprietary/vendor/lib/libwfduibcsrcinterface_proprietary.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libwfdutils_proprietary.so b/proprietary/vendor/lib/libwfdutils_proprietary.so
deleted file mode 100644
index 8cd8b41..0000000
Binary files a/proprietary/vendor/lib/libwfdutils_proprietary.so and /dev/null differ
diff --git a/proprietary/vendor/lib/vendor.qti.hardware.wifidisplaysession@1.0.so b/proprietary/vendor/lib/vendor.qti.hardware.wifidisplaysession@1.0.so
deleted file mode 100644
index 7c1ede5..0000000
Binary files a/proprietary/vendor/lib/vendor.qti.hardware.wifidisplaysession@1.0.so and /dev/null differ
diff --git a/proprietary/vendor/lib/vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl.so b/proprietary/vendor/lib/vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl.so
deleted file mode 100644
index 208fd11..0000000
Binary files a/proprietary/vendor/lib/vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl.so and /dev/null differ
diff --git a/surya-vendor.mk b/surya-vendor.mk
index 7c85693..7734292 100644
--- a/surya-vendor.mk
+++ b/surya-vendor.mk
@@ -8,14 +8,11 @@ PRODUCT_SOONG_NAMESPACES += \
 PRODUCT_COPY_FILES += \
     vendor/xiaomi/surya/proprietary/system_ext/etc/dpm/dpm.conf:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/dpm/dpm.conf \
     vendor/xiaomi/surya/proprietary/system_ext/etc/init/dpmd.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/dpmd.rc \
-    vendor/xiaomi/surya/proprietary/system_ext/etc/init/wfdservice.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/wfdservice.rc \
     vendor/xiaomi/surya/proprietary/system_ext/etc/permissions/audiosphere.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/audiosphere.xml \
     vendor/xiaomi/surya/proprietary/system_ext/etc/permissions/com.qti.dpmframework.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.qti.dpmframework.xml \
     vendor/xiaomi/surya/proprietary/system_ext/etc/permissions/dpmapi.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/dpmapi.xml \
     vendor/xiaomi/surya/proprietary/system_ext/etc/permissions/qcrilhook.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/qcrilhook.xml \
     vendor/xiaomi/surya/proprietary/system_ext/etc/permissions/qti_permissions.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/qti_permissions.xml \
-    vendor/xiaomi/surya/proprietary/system_ext/etc/seccomp_policy/wfdservice.policy:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/seccomp_policy/wfdservice.policy \
-    vendor/xiaomi/surya/proprietary/system_ext/etc/wfdconfigsink.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/wfdconfigsink.xml \
     vendor/xiaomi/surya/proprietary/vendor/etc/acdbdata/IDP/IDP_Bluetooth_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/IDP/IDP_Bluetooth_cal.acdb \
     vendor/xiaomi/surya/proprietary/vendor/etc/acdbdata/IDP/IDP_Codec_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/IDP/IDP_Codec_cal.acdb \
     vendor/xiaomi/surya/proprietary/vendor/etc/acdbdata/IDP/IDP_General_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/IDP/IDP_General_cal.acdb \
@@ -108,7 +105,6 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/surya/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/xiaomi/surya/proprietary/vendor/etc/init/android.hardware.keymaster@4.0-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.keymaster@4.0-service-qti.rc \
     vendor/xiaomi/surya/proprietary/vendor/etc/init/cnd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/cnd.rc \
-    vendor/xiaomi/surya/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/xiaomi/surya/proprietary/vendor/etc/init/dataadpl.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/dataadpl.rc \
     vendor/xiaomi/surya/proprietary/vendor/etc/init/dataqti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/dataqti.rc \
     vendor/xiaomi/surya/proprietary/vendor/etc/init/dpmQmiMgr.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/dpmQmiMgr.rc \
@@ -134,16 +130,12 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/surya/proprietary/vendor/etc/init/vendor.qti.tftp.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.tftp.rc \
     vendor/xiaomi/surya/proprietary/vendor/etc/init/vendor.sensors.qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.sensors.qti.rc \
     vendor/xiaomi/surya/proprietary/vendor/etc/init/vppservice.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vppservice.rc \
-    vendor/xiaomi/surya/proprietary/vendor/etc/init/wfdvndservice.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/wfdvndservice.rc \
     vendor/xiaomi/surya/proprietary/vendor/etc/permissions/com.fingerprints.extension.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.fingerprints.extension.xml \
     vendor/xiaomi/surya/proprietary/vendor/etc/sdr_config.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/sdr_config.cfg \
     vendor/xiaomi/surya/proprietary/vendor/etc/seccomp_policy/codec2.vendor.base.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/codec2.vendor.base.policy \
     vendor/xiaomi/surya/proprietary/vendor/etc/seccomp_policy/codec2.vendor.ext.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/codec2.vendor.ext.policy \
     vendor/xiaomi/surya/proprietary/vendor/etc/seccomp_policy/imsrtp.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/imsrtp.policy \
     vendor/xiaomi/surya/proprietary/vendor/etc/seccomp_policy/vendor.qti.hardware.dsp.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/vendor.qti.hardware.dsp.policy \
-    vendor/xiaomi/surya/proprietary/vendor/etc/seccomp_policy/wfdhdcphalservice.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/wfdhdcphalservice.policy \
-    vendor/xiaomi/surya/proprietary/vendor/etc/seccomp_policy/wfdvndservice.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/wfdvndservice.policy \
-    vendor/xiaomi/surya/proprietary/vendor/etc/seccomp_policy/wifidisplayhalservice.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/wifidisplayhalservice.policy \
     vendor/xiaomi/surya/proprietary/vendor/etc/sensors/config/adux1050_0.json:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/config/adux1050_0.json \
     vendor/xiaomi/surya/proprietary/vendor/etc/sensors/config/bmi160_0.json:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/config/bmi160_0.json \
     vendor/xiaomi/surya/proprietary/vendor/etc/sensors/config/lsm6ds3c_0.json:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/config/lsm6ds3c_0.json \
@@ -201,7 +193,6 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/surya/proprietary/vendor/etc/thermal-phone.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-phone.conf \
     vendor/xiaomi/surya/proprietary/vendor/etc/thermal-tgame.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-tgame.conf \
     vendor/xiaomi/surya/proprietary/vendor/etc/thermald-devices.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermald-devices.conf \
-    vendor/xiaomi/surya/proprietary/vendor/etc/wfdconfig.xml:$(TARGET_COPY_OUT_VENDOR)/etc/wfdconfig.xml \
     vendor/xiaomi/surya/proprietary/vendor/firmware/CAMERA_ICP.elf:$(TARGET_COPY_OUT_VENDOR)/firmware/CAMERA_ICP.elf \
     vendor/xiaomi/surya/proprietary/vendor/firmware/a615_zap.b00:$(TARGET_COPY_OUT_VENDOR)/firmware/a615_zap.b00 \
     vendor/xiaomi/surya/proprietary/vendor/firmware/a615_zap.b01:$(TARGET_COPY_OUT_VENDOR)/firmware/a615_zap.b01 \
@@ -341,7 +332,6 @@ PRODUCT_PACKAGES += \
     audio.primary.sm6150 \
     sound_trigger.primary.sm6150 \
     vendor.qti.hardware.bluetooth_audio@2.1-impl \
-    libFileMux_proprietary \
     libMpeg4SwEncoder \
     libOmxAacDec \
     libOmxAlacDec \
@@ -365,8 +355,6 @@ PRODUCT_PACKAGES += \
     libbluetooth_audio_session_qti_2_1 \
     libdrc \
     libdsd2pcm \
-    libmmrtpdecoder_proprietary \
-    libmmrtpencoder_proprietary \
     libmulawdec \
     libpn553_fw \
     libqcodec2 \
@@ -374,30 +362,8 @@ PRODUCT_PACKAGES += \
     libsurround_3mic_proc \
     libswvdec \
     libvppclient \
-    libwfdcodecv4l2_proprietary \
-    libwfdcommonutils_proprietary \
-    libwfdconfigutils_proprietary \
-    libwfddisplayconfig_proprietary \
-    libwfdhdcpcp \
-    libwfdhdcpservice_proprietary \
-    libwfdmminterface_proprietary \
-    libwfdmmservice_proprietary \
-    libwfdmmsrc_proprietary \
-    libwfdmodulehdcpsession \
-    libwfdrtsp_proprietary \
-    libwfdsessionmodule \
-    libwfdsourcesession_proprietary \
-    libwfdsourcesm_proprietary \
-    libwfduibcinterface_proprietary \
-    libwfduibcsink_proprietary \
-    libwfduibcsinkinterface_proprietary \
-    libwfduibcsrc_proprietary \
-    libwfduibcsrcinterface_proprietary \
-    libwfdutils_proprietary \
     libmisoundfx \
     libshoebox \
-    vendor.qti.hardware.wifidisplaysession@1.0_vendor \
-    vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl \
     android.hardware.camera.provider@2.4-legacy \
     com.qti.sensor.ofilm_hi259 \
     com.qti.sensor.ofilm_imx682 \
@@ -784,28 +750,6 @@ PRODUCT_PACKAGES += \
     libsnpe_dsp_v66_domains_v2_skel \
     libsns_device_mode_skel \
     libsns_low_lat_stream_skel \
-    libmmosal \
-    libmmparser_lite \
-    libmmrtpdecoder \
-    libmmrtpencoder \
-    libwfdclient \
-    libwfdcommonutils \
-    libwfdconfigutils \
-    libwfddisplayconfig \
-    libwfdmminterface \
-    libwfdmmsink \
-    libwfdrtsp \
-    libwfdsinksm \
-    libwfduibcinterface \
-    libwfduibcsink \
-    libwfduibcsinkinterface \
-    libwfduibcsrc \
-    libwfduibcsrcinterface \
-    com.qualcomm.qti.wifidisplayhal@1.0 \
-    libwfdavenhancements \
-    libwfdmmsrc_system \
-    libwfdservice \
-    vendor.qti.hardware.wifidisplaysession@1.0 \
     com.qualcomm.qti.dpm.api@1.0_system_ext \
     fm_helium \
     lib-imsvideocodec \
@@ -820,7 +764,6 @@ PRODUCT_PACKAGES += \
     libfm-hci \
     libimscamera_jni \
     libimsmedia_jni \
-    libwfdnative \
     vendor.qti.diaghal@1.0 \
     vendor.qti.hardware.fm@1.0_system_ext \
     vendor.qti.imsrtpservice@3.0_system_ext \
@@ -831,11 +774,9 @@ PRODUCT_PACKAGES += \
     TimeService \
     PowerOffAlarm \
     QtiTelephonyService \
-    WfdService \
     dpmserviceapp \
     ims \
     qcrilmsgtunnel \
-    WfdCommon \
     tcmclient \
     com.fingerprints.extension \
     audiosphere \
@@ -888,8 +829,5 @@ PRODUCT_PACKAGES += \
     time_daemon \
     vibrator_calibration \
     vppservice \
-    wfdvndservice \
-    wifidisplayhalservice \
     xtra-daemon \
-    dpmd \
-    wfdservice
+    dpmd