diff --git a/Android.bp b/Android.bp
index 376c1fe..1810bfe 100644
--- a/Android.bp
+++ b/Android.bp
@@ -135,18 +135,6 @@ android_app_import {
 	product_specific: true,
 }
 
-android_app_import {
-	name: "NQNfcNci",
-	owner: "oneplus",
-	apk: "proprietary/system_ext/app/NQNfcNci/NQNfcNci.apk",
-	overrides: ["NfcNci"],
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	system_ext_specific: true,
-}
-
 android_app_import {
 	name: "QtiTelephonyService",
 	owner: "oneplus",
@@ -219,13 +207,6 @@ dex_import {
 	system_ext_specific: true,
 }
 
-dex_import {
-	name: "com.nxp.nfc.nq",
-	owner: "oneplus",
-	jars: ["proprietary/system_ext/framework/com.nxp.nfc.nq.jar"],
-	system_ext_specific: true,
-}
-
 dex_import {
 	name: "com.qti.dpmframework",
 	owner: "oneplus",
diff --git a/proprietary/system/etc/nfcee_access.xml b/proprietary/system/etc/nfcee_access.xml
deleted file mode 100644
index 0146af0..0000000
--- a/proprietary/system/etc/nfcee_access.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- Signature for eSE related APs. -->
-    <signer android:signature="308203fe308202e6a003020102020900f2455c28029a1705300d06092a864886f70d0101050500305d310b300906035504061302434e3111300f060355040813085368616e676861693111300f060355040713085368616e67686169310c300a060355040a13034e5850310c300a060355040b13034e5850310c300a060355040313034e5850301e170d3133303930333132353035385a170d3431303131393132353035385a305d310b300906035504061302434e3111300f060355040813085368616e676861693111300f060355040713085368616e67686169310c300a060355040a13034e5850310c300a060355040b13034e5850310c300a060355040313034e585030820120300d06092a864886f70d01010105000382010d00308201080282010100c3800fc6e4e9809b7930280cc48e687c51739e837418fc3760fad42d5e6cd27cb510b5d459d9c76258cc95acc2a445ea104ce91d589f0773dd47041ed007f7bd258c07ee0650158dec977a01c0c09419d738a53c3e4de3f2af2e7fc7d00dbce5984b31c298ad25eec190079727e5fbf65c79da0075840b2acc20bd73ce5b86d6e2fbd99cbe90783470e47e45cd66535178bd27c0a2655e7232c902a114a93bcae66fbe71284fcd5b1083c8bf01f1255acf7bf47f35de670ccde27e8c5dafe231edb614ff94604ff45eda9ccac084254a1819d65a016b1b5a725729dce73196f8b1298ca4f9579f3ce054b2c96397d28a64f52d027dd811d7bb375160a12ab55b020103a381c23081bf301d0603551d0e0416041422cd93b4043f16f9aba0bf2a5a48bcac61dab59e30818f0603551d23048187308184801422cd93b4043f16f9aba0bf2a5a48bcac61dab59ea161a45f305d310b300906035504061302434e3111300f060355040813085368616e676861693111300f060355040713085368616e67686169310c300a060355040a13034e5850310c300a060355040b13034e5850310c300a060355040313034e5850820900f2455c28029a1705300c0603551d13040530030101ff300d06092a864886f70d01010505000382010100172adb9a27787545815f779e4b800f7e5b56a052ea113786b94ff186ce54f45765593f3be35050da707e661fd6ba557a75119efbc07a8b49148c9b3bf32c42d61d6265f003dbb5f9df3a37030ecaeaca454ed4b7ceba5c994cd5d552ef21c34cdbc8a0353f57dd009f8b8f8b0013dceabce6779cc15b4b157d1fa4c2a33d493744154670958acd786eaa3db0008f588a65e84c7f358b018f7d4fabd8cbd4f8c2fb9e289faf114d4c21a20f3caa23e10bb9e1a71f1c4df90abcba3cd1f39ad105b5b1a1b87095192b2f5feb4a6a32d63a11eb1c9cedb5597e2e12445a9c3a793370f3e16f14a14323479352159f01410b4a16702f9ee8b8f40c67d8a5d2a17f17" />
-
-    <signer android:signature="308203ae30820296a003020102020450459256300d06092a864886f70d0101050500308198310b300906035504061302434e31123010060355040813094775616e67646f6e673111300f060355040713085368656e7a68656e312e302c060355040a13255269636820486f75736520476c6f62616c20546563686e6f6c6f677920436f2e2c204c746431143012060355040b130b456e67696e656572696e67311c301a0603550403131372696368686f757365676c6f62616c2e636f6d301e170d3132303930343035333230365a170d3334303833303035333230365a308198310b300906035504061302434e31123010060355040813094775616e67646f6e673111300f060355040713085368656e7a68656e312e302c060355040a13255269636820486f75736520476c6f62616c20546563686e6f6c6f677920436f2e2c204c746431143012060355040b130b456e67696e656572696e67311c301a0603550403131372696368686f757365676c6f62616c2e636f6d30820122300d06092a864886f70d01010105000382010f003082010a0282010100ac9b3e1579a5aa8bb8e4287945e795530b9601d9e6b7a013ed06277b0c0ba7a46098f55b82a6dcd8f8a3df4b8bf0b5986fa8940a51aec95fb8859dc1c8c0f4ad34cb3f37fb3f44d96fc3af3e9ef690200b9419b3d2b3286f50016c85f2d7bf47d7e06c5bdc2b57bc5d708d904ab978fc9e96d338bff51e23eb2feb0a8a56568d46533574be985b6d6ace9b568c7cb019db63fd73e515bfd8d35e21afa2ed92c64e1719f74f5f14b1a275d18bee6aa3f126bb387ea6314ea3a356b4bb65db32bf9b9e289236b30812ce89f6f79d8bd254f070f0c316e39d22d4034811cffdaa5104a971afb1ef90205ef8ee9da574d4e3cad45f34be5e40b45b28fe19f32e4fff0203010001300d06092a864886f70d010105050003820101003ec33aa2fa0aca7a2cf9951ecc89341df2d5862c67f13ef355325a77bb9bd2c79e4120126e80c6c0cd556ec1a681f3118a8047456b3d30b58f585c599853f1ba4deb70730cce8e85ff47dc46c3c442bedc125c292303bcb2e8eaa627ef2fd42d0bd70fa0ec2d051e0318a1bf329bc875f2c51c2d87750bff892ca0d27028901446b318b62d32fe8c4eda4f422b4f1eb28364bb4cab6281c3023149d8f9847db2efb1977ac6500a414a5eeac2de5d208eb76f3dbde51afafa37348d7d765a0111e945dc8cd4565464500408be92fd89b807e4c6fa899b740b99b9f476ecfe701b1c4060e1b4e36d493a67c55f896977eec8613d847b06dd98936db98560cd325e" />
-
-    <signer android:signature="308203ae30820296a003020102020450459170300d06092a864886f70d0101050500308198310b300906035504061302434e31123010060355040813094775616e67646f6e673111300f060355040713085368656e7a68656e312e302c060355040a13255269636820486f75736520476c6f62616c20546563686e6f6c6f677920436f2e2c204c746431143012060355040b130b456e67696e656572696e67311c301a0603550403131372696368686f757365676c6f62616c2e636f6d301e170d3132303930343035323831365a170d3334303833303035323831365a308198310b300906035504061302434e31123010060355040813094775616e67646f6e673111300f060355040713085368656e7a68656e312e302c060355040a13255269636820486f75736520476c6f62616c20546563686e6f6c6f677920436f2e2c204c746431143012060355040b130b456e67696e656572696e67311c301a0603550403131372696368686f757365676c6f62616c2e636f6d30820122300d06092a864886f70d01010105000382010f003082010a0282010100a97823afdfe14e242a00320ef06ee9b4d9933162d0e5d5ba8c0772bc1feb8dc126bbb3593253c33ebe4e5a9c725bd3b5777f783f51a0e474dbed76d2d3f0c80e66f717da4a01356d4d83531ad2037290f3b2d6cc6a8896cb9f5048f2fd19df2faa3d0b15759e5ca10f1e4e16a7dd2e3c9eeda9a0a34c50b2ba5258ae815581cd253a4444d51d5ceb209e76da6434208c43fe3447b63d19866fda7a26c7c72a97c20f789614581c6f3d94db58ecb6b449f6a085d62a8bb2d660e92ec8c0f2bf76a6c8c8d3a6239d8cb38d7383e13f0c4c15de4a58a51fab2dfb3d10664e1e55ec2ea180285b2c363e21c42696fb38840a4bb3601fd77d09527e2c45644363a2a90203010001300d06092a864886f70d010105050003820101007503a365ecd79316787fec6ef427244f2c7a54537a1bc3191258f40e0ee67ad3c28dc4fea7ff0581dbd76df096ed24740fbfda4ac16ed05e2888fbf347c5f4003cef9545cc1d46587323b41e9843d1062ac338a40caf3002056cf06495c7aaf1a11ccc4537df6bc3724261d019e295bba7a16d7bd47f6acdf72ed4eb1dcb2280d80de0567a48f453d0c1543849f203c52486cc95d17cd97d9e8dfd04f7d237664b1d7356a9440a79e908977b799dd58799edfaa5a6810efc4c4041c0ccee452e711719bf78f28594f31843271296399b990ece20ebea9145cc64bad769d639975dcf72054ab303eba95d76733422b88b7e649c2bca26aeacd5583c44cb644e4f" />
-
-    <!--  SmartCard API signature-->
-    <signer android:signature="3082039f30820287a003020102020900feb7d6fc66337664300d06092a864886f70d01010505003066310b300906035504061302434e3112301006035504080c094775616e67646f6e673111300f06035504070c085368656e7a68656e3110300e060355040a0c074f6e65506c7573310c300a060355040b0c03524f4d3110300e06035504030c074f6e65506c7573301e170d3135303332343134313835305a170d3432303830393134313835305a3066310b300906035504061302434e3112301006035504080c094775616e67646f6e673111300f06035504070c085368656e7a68656e3110300e060355040a0c074f6e65506c7573310c300a060355040b0c03524f4d3110300e06035504030c074f6e65506c757330820122300d06092a864886f70d01010105000382010f003082010a0282010100bbd7b2c5c30d6c2fcbaa9a8a52e6737ab0d5dd3d18c053660cb949ee3df7748165a0fdb9e0e3a3292516d58f8736e25e786c726e4837ce3d5288e467c19abaa000828c8953e74f0d933bc6264396972ee5703250f15982eee3c37ddf55ca4705da2d4fd8f6f769a58548c6392e3736b638c5e595a9b9846253e9f37fdc12ab700e2310f530e425a0f917342d1b20e9d67fff943965c7a5977b570659ea8ba2ce0ba3011923268253597133b9215a18af0e69e1d85b10c592b342edb7e10b24498570b55ea4caa0a0f67b9fb84717dd61a76ebd55027b2c4a7a723fce02fd6158a74251f2e9e1485e47f9ce8c568bc04c077382927c2ccb7a305615ed427587d70203010001a350304e301d0603551d0e04160414d10888995d23c4a1e63a1b7ad4987da4163b4232301f0603551d23041830168014d10888995d23c4a1e63a1b7ad4987da4163b4232300c0603551d13040530030101ff300d06092a864886f70d01010505000382010100853d94d58e2d16bc1ee8cb1114ebff10fee2d7c672acd5023a7eded398855bcc5394727b83724bd5e5a51b86b61ed3585e815efc73bef520aaaf91042aa75a64a2821a6fb558f84038fd31b45b735c7b3bed7aa247fd34d384f768c885537474208b30d2fbf0fc74784955a234a3448a222264b1c2e8a51d02e0d1829b662fb4620dab159350c48e5100ff1a39ee52bd1741c7ad5197ec0affaa709142889eb30c43d29b79715873250796d493d156f239b7294b4ab428e4c6b798df324b54009e6755135091bead7409ff8e3db30f0ad053ed9eb542703c2badfa180a083c53597c0b543041ad435010a4cde009792cb8995055a8673c22ff68634cd88f2d76" />
-
-    <signer android:signature="308203e5308202cda003020102020900ca7f2ef3e2f1842e300d06092a864886f70d0101050500308188310b300906035504061302434e3112301006035504080c094775616e67646f6e673111300f06035504070c085368656e7a68656e3110300e060355040a0c074f6e65506c7573310b3009060355040b0c0253573110300e06035504030c074f6e65506c75733121301f06092a864886f70d01090116126f6e65706c7573406f6e65706c75732e636e301e170d3135303530373037323332335a170d3432303932323037323332335a308188310b300906035504061302434e3112301006035504080c094775616e67646f6e673111300f06035504070c085368656e7a68656e3110300e060355040a0c074f6e65506c7573310b3009060355040b0c0253573110300e06035504030c074f6e65506c75733121301f06092a864886f70d01090116126f6e65706c7573406f6e65706c75732e636e30820122300d06092a864886f70d01010105000382010f003082010a0282010100ce24d23c2044f698476fe8f79388fa901520142424b58d10a5656a27bf1fa5ca4e381d8bc5773f29271e892bf25b06357c0cab9a06a93beb3c9eced9928c938f2829fbc63bc045dcfac0660f747dfe325ed5a8c7b785ccca472bc51afa823c1c0d8dd088aa8ef3ead6053f0020fee55b6c450b0c90f9a19f8f60808d1e0eb24309216f39bccb58991c4c1656aed444a5a0652e84587ae44e7c60101190d8d0d92a37407fc6da5432a8f20fe6414cf0ce2257edf76a7d2eb34d0d31e183867b552030beaf8e6e7ade37668d87c2bd52b8c29d3d30437058a31003f3dbbe8943db602feb71c7af51388234a0ea713a9fdd17ebc89463ff1065ee970edd3969d4110203010001a350304e301d0603551d0e04160414e24ca18e47f2c07476f9d37ce0d85a9f2fdf4456301f0603551d23041830168014e24ca18e47f2c07476f9d37ce0d85a9f2fdf4456300c0603551d13040530030101ff300d06092a864886f70d01010505000382010100a682431bd6bd9d99dc267686842fe3e2d6979798ec565314dcbede7b921ba78e210e9682dc72c07c09b0882b65df2a366007f3e4a594d0a85d04644b8e0f3e13cf16f2e764716625fe8dcf93e3936d496a86d0cc4c0aa2f7d46d904eec834c604dd1c5ad2fd1ad599d6ab3375f36382303685edca5078e931977679a4f4c8a532294fd7dbc0c55ffb33e3aa064b628b8083def2ad60ba0abf8a777d69e38fe18bc2e4c63e94d05c2081b947b7caf919f272157ba90ea83a306fd2941c1d6380cc55abf7983125d4d60ac1463bdbf9baf41a6fef117b37d03d086cf754f4f3ef3b5cb054f5d2f26115b221818c785b3de1be552bb1decdf4f3d373bdd5022d150" />
-
-    <!-- add for AndroidR cts sign-->
-    <signer android:signature="308205c8308203b0a003020102021407068ebb944096c677cd9a103981614365cb442e300d06092a864886f70d01010b05003074310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e205669657731143012060355040a130b476f6f676c6520496e632e3110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643020170d3230303530363033303630355a180f32303530303530363033303630355a3074310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e205669657731143012060355040a130b476f6f676c6520496e632e3110300e060355040b1307416e64726f69643110300e06035504031307416e64726f696430820222300d06092a864886f70d01010105000382020f003082020a028202010093021a1ffa68d8eea0562312a4272dafc353bf90e6d626667e1e513ac1af737835b6f66f29dc2abd357eeeb3aea86deef88538f78e41219b5dbdfcc9b4d58cae524df2b931361b4cbd4130e42e606236892189ed42a6b5d0f46dfbbcc88dc32a58168ba760ec14d88062c9868698a3f94bf606a75d205e17978bf22c0128c4eff0dc57e836f80942b7d553b966efde6b77de0892170ca6eb2f3676986cb3adf8d7ea8c3469ca0f4b53d9831a27f9336922385480cd1065e1378ac37da09fb59b711c22db61c4d9afab953198cf665cd7c96fe8e544e3bb4496fa4feca7b029213d4005afc806a0cd31f9de59dd29d94c7d55b6612f895ff7d41fc05de48dcf55ddc1d3af005c546755112fefcc8b499944672b526e0763143926cd273d8b0f626627e3684362dc79a71bb7eb5f0db035035cdda42e3a976f16c75ecd87ca1c65c11d9ca946cefbe05340eb91ff4c53d6d9f0b34d3f738996f0d6c484e784669aa745e0fdaa905876985fde170a42e77fd51118962c43f931d1cc3363f132a8e75412fc1c931e0318d9da28b0aa471f91ca7d65f070565529f33882601e6eed1f3f070823c9aeaada44225d94187eba9fd7180926454cfa34b95469ce7fb3ac87a7b4f6cc9f104bab91e9087c8d7562ff17da084235ef124e63e5c427de5ad293ac95a55829923a4fa6fbf5417272b32575c2f401ff22e6bd427d49c3243b939f0203010001a350304e300c0603551d13040530030101ff301d0603551d0e04160414d7a686d42c02d77f5e39c5da26d533386ad08735301f0603551d23041830168014d7a686d42c02d77f5e39c5da26d533386ad08735300d06092a864886f70d01010b05000382020100364473d5f0203deb039fe8b1fee09f04655b00f7605dceac6ceae80c5b367ca89ca332b34617ec8f50bc82bbf860882906a4a925150f134a80a0437e67b96f965a2a1559bcb88792fbb0009427f6465a0defa66c6bbf037e58a826072a85396fd497d2d05afbcb3a686d095a7159e30bc7cf865098b88fbb4fab4159fd4f73e8b23df1446d5390fd83bf49b57fd2079fa05289daf5e13399ae9c1f8b9c265f081969d4e7f431e01029d56b7a9fccca912570abe99fa24e35d7aadd9590b92d2398d25a420b26002739f27c0768078a383e98d8fd72197907b6a7d14fc44f91181437300c8c9322aef647175e46519f004577ce27be8778b5eef8d162cecf94d3e8533f744f2928aafdc52065b803ce5750a73d49e3775965aaf77a94b70a0b8d8bbbc9e81d5091d0d37ba71832155e63e6fc0104c43661142202c2f76f651b95282eb5dfc0fa4953b1c6f21fb60ddaf8effc57c55f73c0e5c68d4054359c83ac5f0758ad2d77bb696f2ef61ba7ded144341789814dc3a978342984c5ac2f080cc882e1b36c90c0aac3b46462dc13f8ebc257d6d193273f86f054df771b18f282f6c1941f2ed4b4793044523a9821eb573162a8c0914896c76fdb4a620af32fefb6305a08ffc9fe885816553f2cdd0285e86454629e9296441271323e1597653da6009d3f3653702df94c3097bffe25244e32f30a801e6d49412a2e5056bcb531" />
-
-    <!--  Snowball signature-->
-    <signer android:signature="3082038F30820277A00302010202047F337B4C300D06092A864886F70D01010B05003078310B300906035504061302636E3111300F060355040813087368616E676861693111300F060355040713087368616E6768616931153013060355040A130C736E6F7762616C6C7465636831153013060355040B130C736E6F7762616C6C74656368311530130603550403130C736E6F7762616C6C74656368301E170D3134313230333130323930385A170D3432303432303130323930385A3078310B300906035504061302636E3111300F060355040813087368616E676861693111300F060355040713087368616E6768616931153013060355040A130C736E6F7762616C6C7465636831153013060355040B130C736E6F7762616C6C74656368311530130603550403130C736E6F7762616C6C7465636830820122300D06092A864886F70D01010105000382010F003082010A028201010096E3B6C388FA3DCB718ED5D9F919C384FD1C5F8E6FEDA198E29CE95EABB9BCF9CAB94441CACC229B341C2D73FCBEA3F99CF71A56FC52784FB8CE2137DF9EEF5518FACAEEEF5E0252899EF79155AA2FCC4546B1125CAFE157026F5BC80484D65EE2C3F0417E34003B69CA4B235D24E2CEA1D1DB3DBAD23B8DA80A72F96827A96B18D758FC1AD34DE648BBAD2C160D4D3FDD441B9515FB197AC8D0C5B1830DE7DD4E7DDACF3A8308EF51E143BD17CB657B902D814B1F9C46427700DA0F3E549EBD2D1A45030B0AC2FF2490342A2E1F5BDEE0DB4C74967781B63D7CF4B57349000F511B8FBC79898CCCBD4DE9499CDA56E8653CA2D0B05651B6F01C0FB47E4079970203010001A321301F301D0603551D0E04160414B30F1966989E67527071623E91EE841F5EFD9DF9300D06092A864886F70D01010B050003820101001A4185D2DCA37293B040A2EE2DBCBCAD9D95D5B450627F41D1FA4418D550F17B8E3A90DF5E505C25EEE57A2FEC699FCEF06C5F2EBF65B774FCB20E840287F31520A72318EB02788073A8C2A6AE2F56753A72C0B1D95A7ECFD2ABA605BF626B521E01706F372F51399A35BFBA1472E7513F6481054AA762EF874794464B4393E871E3171C9FBA6159C1EB0A5129BAC3F6CD616A553A9E0788A67493985DFBC4471C457EF171B80AA6F6306981CF15CE9336D2A0985C7F0929C06622052D579F7CD603BA86ECECD54DB8149AD98EC04B267048D0BD06488DC279D7FAD550851923A542DB507B66F752C62A0F28AD4E67218EA99BD134ECAB2F4E98CD46A75CCD7A" />
-
-    <!--  Google wallet signature -->
-    <signer android:signature="3082044c30820334a003020102020900a8cd17c93da5d990300d06092a864886f70d01010505003077310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e205669657731143012060355040a130b476f6f676c6520496e632e3110300e060355040b1307416e64726f6964311330110603550403130a476f6f676c65204e4643301e170d3131303332343031303635335a170d3338303830393031303635335a3077310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e205669657731143012060355040a130b476f6f676c6520496e632e3110300e060355040b1307416e64726f6964311330110603550403130a476f6f676c65204e464330820120300d06092a864886f70d01010105000382010d00308201080282010100c30f88add9b492096a2c586a5a9a80356bfa026958f8ff0c5dfaf59f49268ad870dee821a53e1f5b170fc96245a3c982a7cb4527053be35e34f396d24b2291ec0c528d6e26927465e06875ea621f7ff98c40e3345b204907cc9354743acdaace65565f48ba74cd4121cdc876df3522badb095c20d934c56a3e5c393ee5f0e02f8fe0621f918d1f35a82489252c6fa6b63392a7686b3e48612d06a9cf6f49bff11d5d96289c9dfe14ac5762439697dd29eafdb9810de3263513a905ac8e8eaf20907e46750a5ab7bf9a77262f47b03f5a3c6e6d7b51343f69c7f725f70bcc1b4ad592250b705a86e6e83ee2ae37fe5701bcbdb26feefdfff60f6a5bdfb5b64793020103a381dc3081d9301d0603551d0e041604141ccece0eea4dc1121fc7515f0d0a0c72e08cc96d3081a90603551d230481a130819e80141ccece0eea4dc1121fc7515f0d0a0c72e08cc96da17ba4793077310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e205669657731143012060355040a130b476f6f676c6520496e632e3110300e060355040b1307416e64726f6964311330110603550403130a476f6f676c65204e4643820900a8cd17c93da5d990300c0603551d13040530030101ff300d06092a864886f70d01010505000382010100a470c728e1d31b06d9af6ae768b565046c57806b9843724931d75d4ca10c321520d33ccfed2aa65462234c9ef9b6f910cc676b99cb7f9895d6c06763574fbb78331275dc5cf38fbaa918d7938c051ffba2ade8f303cde8d9e68a048d1fdb9e7c9f2a49b222c68fff422bf15569b85eeeedb04aa30873dbe64b9c9e74f8f2c2f6c40124aaa8d1780d18512b540add28b3e9581971a4170dd868cf5f31e44712b2c23bb51037d7ef9f87a6e5bdb35e2ceb6bb022636c17a56a96bc7a50258c0bd2ed7b31555a18452e17321a0d52838c82f63f742d74ff79586a5cbb7faf7198a84bcf744310e9e927597f00a23dd00660800c2238d90b2fb372dfdbba75bd852e" />
-
-    <!--  Modded Google wallet signature -->
-    <signer android:signature="308203733082025ba00302010202044f796622300d06092a864886f70d01010b0500306a3110300e06035504061307556e6b6e6f776e3110300e06035504081307556e6b6e6f776e3110300e06035504071307556e6b6e6f776e3110300e060355040a1307556e6b6e6f776e3110300e060355040b1307556e6b6e6f776e310e300c060355040313056c6f736572301e170d3134303230353039333732325a170d3431303632333039333732325a306a3110300e06035504061307556e6b6e6f776e3110300e06035504081307556e6b6e6f776e3110300e06035504071307556e6b6e6f776e3110300e060355040a1307556e6b6e6f776e3110300e060355040b1307556e6b6e6f776e310e300c060355040313056c6f73657230820122300d06092a864886f70d01010105000382010f003082010a02820101009bbae4a25116cdca302b9e58458d7c1bd25eb3f51ab3dff00304ad8f86d7161564f1cbcfbef059831596c343f4df238471341abdfcdc5ae285744d7fee5b65969f10048a3947c8cc1c0000ef5e9b6aa74fc31898e99f2efcd9a66920208eed80f6b82fd6844ab2ec4484f26ccb2398ed86bf0d1c1a4a2728f0ee0a1a2ca9695b42450ab2cd5773daa070b653793f886dad0387b51c507e9e9ff1d2e4cb977f5ee252bae5e6a5a38c4a77b2383d3acffc817b6f325feb8fe0740345a3aa7b3caa37d553f206bbb2a9966323330b2988287093dffc9d5a0345827b38dfedf44b9b79453b74616ee26646698fd342943f6ab49f3b39c4bb11698a34b73320abb1a50203010001a321301f301d0603551d0e04160414b7b1f25001279dcbcad0dbdc11d3fa8dca86f4da300d06092a864886f70d01010b0500038201010005cb2e5d34af75768814275349dc9cf02442ae00032fb91455d41d947dfdd6909194504162485fa35db9781ee34419d5ad1db26bbe5760c7c73dea78134634fd75b62d7dbeb96b140716f4ef5a9b1ffe2c6b0695389273d54dd652dd63ad742bcb57a31899fe29b76d913d14e7bea516be7945b521552033e4285a53e27d13f6b26e587af55d9fbae63b809f187b571e3987d9e4838dac61ae54d123ea0249c47af71bd90278e7a5438ba13af958eaf21d21a4bb827a87f6eec50d2da2c2e418b153e6028fd35588b7ab6053733ea34419ca3a1ac33e83abe0e88acf83971c9e41834e61d940dc2fac9b7bb16bd4e1455a1ab6990becf5e8e8dee0910a20b3d3" />
-
-    <!--  Sequent Wallet signature -->
-    <signer android:signature="30820243308201aca00302010202044e837976300d06092a864886f70d01010505003065310b3009060355040613025553310b3009060355040813024341311530130603550407130c526564776f6f64204369747931193017060355040a131053657175656e7420536f667477617265311730150603550403130e44726577205765696e737469656e3020170d3131303932383139343535385a180f32313130303930343139343535385a3065310b3009060355040613025553310b3009060355040813024341311530130603550407130c526564776f6f64204369747931193017060355040a131053657175656e7420536f667477617265311730150603550403130e44726577205765696e737469656e30819f300d06092a864886f70d010101050003818d0030818902818100c08f06fc92ad5a3b9492c1a6586aaf2e5a0d8785dcd690252191addf3563b89f5aeaaeac576afa5b8a82176ad7c4c5898e477793db324922a7373c80d25aef5b33fbeaeba440be43f62573b7fe1f79382824c28640d6ae8b79f86094a51a1f2aa7e0c78d806d6ecd5d350cef5c0ebc9800dafa3d154978b7d884339a96d8168f0203010001300d06092a864886f70d010105050003818100bf5fdeb29942da3c1103b25098c42c5a06824705dae895c48c89ea0a47cbb8bdc3ad14f3920fa46a424f4318b96efc1765c4811d88de682a965584389bc749e4738c5c84ffbbec4d263e4744eebb7c4fef73eaf8e6575eb7dd07d33d302f3029966c70de13392adab45fa65b642c023caeef76ad0f65aea66f9a23ebadc1df9d"/>
-
-    <signer android:signature="308204a830820390a003020102020900936eacbe07f201df300d06092a864886f70d0101050500308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d301e170d3038303232393031333334365a170d3335303731373031333334365a308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d30820120300d06092a864886f70d01010105000382010d00308201080282010100d6931904dec60b24b1edc762e0d9d8253e3ecd6ceb1de2ff068ca8e8bca8cd6bd3786ea70aa76ce60ebb0f993559ffd93e77a943e7e83d4b64b8e4fea2d3e656f1e267a81bbfb230b578c20443be4c7218b846f5211586f038a14e89c2be387f8ebecf8fcac3da1ee330c9ea93d0a7c3dc4af350220d50080732e0809717ee6a053359e6a694ec2cb3f284a0a466c87a94d83b31093a67372e2f6412c06e6d42f15818dffe0381cc0cd444da6cddc3b82458194801b32564134fbfde98c9287748dbf5676a540d8154c8bbca07b9e247553311c46b9af76fdeeccc8e69e7c8a2d08e782620943f99727d3c04fe72991d99df9bae38a0b2177fa31d5b6afee91f020103a381fc3081f9301d0603551d0e04160414485900563d272c46ae118605a47419ac09ca8c113081c90603551d230481c13081be8014485900563d272c46ae118605a47419ac09ca8c11a1819aa48197308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d820900936eacbe07f201df300c0603551d13040530030101ff300d06092a864886f70d010105050003820101007aaf968ceb50c441055118d0daabaf015b8a765a27a715a2c2b44f221415ffdace03095abfa42df70708726c2069e5c36eddae0400be29452c084bc27eb6a17eac9dbe182c204eb15311f455d824b656dbe4dc2240912d7586fe88951d01a8feb5ae5a4260535df83431052422468c36e22c2a5ef994d61dd7306ae4c9f6951ba3c12f1d1914ddc61f1a62da2df827f603fea5603b2c540dbd7c019c36bab29a4271c117df523cdbc5f3817a49e0efa60cbd7f74177e7a4f193d43f4220772666e4c4d83e1bd5a86087cf34f2dec21e245ca6c2bb016e683638050d2c430eea7c26a1c49d3760a58ab7f1a82cc938b4831384324bd0401fa12163a50570e684d" />
-
-    <signer android:signature="308204a830820390a003020102020900b3998086d056cffa300d06092a864886f70d0101040500308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d301e170d3038303431353232343035305a170d3335303930313232343035305a308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d30820120300d06092a864886f70d01010105000382010d003082010802820101009c780592ac0d5d381cdeaa65ecc8a6006e36480c6d7207b12011be50863aabe2b55d009adf7146d6f2202280c7cd4d7bdb26243b8a806c26b34b137523a49268224904dc01493e7c0acf1a05c874f69b037b60309d9074d24280e16bad2a8734361951eaf72a482d09b204b1875e12ac98c1aa773d6800b9eafde56d58bed8e8da16f9a360099c37a834a6dfedb7b6b44a049e07a269fccf2c5496f2cf36d64df90a3b8d8f34a3baab4cf53371ab27719b3ba58754ad0c53fc14e1db45d51e234fbbe93c9ba4edf9ce54261350ec535607bf69a2ff4aa07db5f7ea200d09a6c1b49e21402f89ed1190893aab5a9180f152e82f85a45753cf5fc19071c5eec827020103a381fc3081f9301d0603551d0e041604144fe4a0b3dd9cba29f71d7287c4e7c38f2086c2993081c90603551d230481c13081be80144fe4a0b3dd9cba29f71d7287c4e7c38f2086c299a1819aa48197308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d820900b3998086d056cffa300c0603551d13040530030101ff300d06092a864886f70d01010405000382010100572551b8d93a1f73de0f6d469f86dad6701400293c88a0cd7cd778b73dafcc197fab76e6212e56c1c761cfc42fd733de52c50ae08814cefc0a3b5a1a4346054d829f1d82b42b2048bf88b5d14929ef85f60edd12d72d55657e22e3e85d04c831d613d19938bb8982247fa321256ba12d1d6a8f92ea1db1c373317ba0c037f0d1aff645aef224979fba6e7a14bc025c71b98138cef3ddfc059617cf24845cf7b40d6382f7275ed738495ab6e5931b9421765c491b72fb68e080dbdb58c2029d347c8b328ce43ef6a8b15533edfbe989bd6a48dd4b202eda94c6ab8dd5b8399203daae2ed446232e4fe9bd961394c6300e5138e3cfd285e6e4e483538cb8b1b357" />
-
-    <!-- Pengtao signature -->
-	<signer android:signature="3082019930820102a003020102020453daed39300d06092a864886f70d01010505003010310e300c060355040313056c75636b793020170d3134303830313031323832355a180f32313134303730383031323832355a3010310e300c060355040313056c75636b7930819f300d06092a864886f70d010101050003818d00308189028181009006426c089bb507cda02ed3b559dc543fbf776e7cbf59a7865c53b7bbf5ef138d38ce7fda6f4483d25925d7edeff450f2f752753948a6d1abaed850b36e2998a29890e9c604b44e9d81709b72ca89448766ed4c5e270c5edfadbc46d8d87e8c64ada2ea0ddb17909cac968d442f1776ff9099beaaf9d96e04f6aef4fff4ec3f0203010001300d06092a864886f70d0101050500038181007235435fe41f40c2a6b0b1c3212a0ed43b47c2959be625a93f577441b3b03a8ad540d4f449962b7e09633b6d42256d4c49943ff06ba225dc963f51d474bea16255176ed352f4482daa4a0f3e87080daa64c44e9447498f0f550c9f541375949228c5421938e46fcf8b5ccfba8f04f079e21098ae0a6b18382ad1086b62221d70" />
-
-    <!--BeiJing signature -->
-    <signer android:signature="3082019730820100a003020102020452776c1a300d06092a864886f70d01010505003010310e300c06035504031305756d706179301e170d3133313130343039343235305a170d3433313032383039343235305a3010310e300c06035504031305756d70617930819f300d06092a864886f70d010101050003818d00308189028181008f7a867970b2b5d8465f32026e9de8814adc6efb3dbe1d280cba819bd442432269a726c80b0a92afd0f4f5f62c0640fe96530e64f473393b520943701b3efebeaaae42272836e5afa4853f5e3023faf1bef3c41940a36a6ee23d94e01832f688a2e056f02d30615dfe1a9612dc5e7a6d53981e0b7488dc49614468c1ab5be22d0203010001300d06092a864886f70d0101050500038181003341b3a2cd5b5daf6affbce61dcd02e2b780607c99de2c6e3644a44c903b538cfe6c508ceb4f0feb322006f2e32fa24280969ef790ea2fcf4b6e0414dcaba78caef49080d67d5ea0809f233d6ef490b7b3d8ea69251b9c6f45041422b56ce15010d94efc59391d10d0b5bf8ed056d0a77926795124dfe5fd83be0f7202f6d9f1" />
-
-    <!-- OPPO Wallet -->
-    <signer android:signature="308203ef308202d7a00302010202090087ec320a9738f341300d06092a864886f70d010105050030818d310b300906035504061302434e3112301006035504080c094775616e67446f6e673116301406035504070c0d5368656e5a68656e20566965773110300e060355040a0c07416e64726f69643110300e060355040b0c07416e64726f69643110300e06035504030c07416e64726f6964311c301a06092a864886f70d010901160d6f70706f406f70706f2e636f6d301e170d3138303632353037353830365a170d3435313131303037353830365a30818d310b300906035504061302434e3112301006035504080c094775616e67446f6e673116301406035504070c0d5368656e5a68656e20566965773110300e060355040a0c07416e64726f69643110300e060355040b0c07416e64726f69643110300e06035504030c07416e64726f6964311c301a06092a864886f70d010901160d6f70706f406f70706f2e636f6d30820122300d06092a864886f70d01010105000382010f003082010a0282010100bc93f2320d6d4cbe2688c87cabf17797e97ddae131c11e3197d9e1e82afb382f14b1565468e0ce3773a5e06d31428f3a98892f60e420d649a3b14326c38a6740245df4ca6692697e75926e642e3b4e8b1c4217bf12f4562f9dca6741531226c1dd9ed4b4ea2d4ba3b4f303d3225203b1e40b13d622fa6a15da4ddd7fb11a16e12f9e872d2c2b2539ec334e2225d0b3748e0248299eabe394ec0f532c36601894674bd04bd22b0cfc17551415dc1a73caa329ab0f4c69ccfdb6fd3498f01f595192fa5e80a6f5d8c6d305a0e45f8532126933267d7b268281ed4820545db6f29474b3aa514c110251f4a66135f76d79cba300223ccb323c342c75cd69ac5d4a650203010001a350304e301d0603551d0e041604142709b0317d0f80428badbd6cee83b992410ddfdc301f0603551d230418301680142709b0317d0f80428badbd6cee83b992410ddfdc300c0603551d13040530030101ff300d06092a864886f70d01010505000382010100842c117d48a86d8b3a04b32044f23474a184966e15f7d379a8394b1bcf016f5c1a2ab704ec0e54028fe5dff9bedee3add06c301052e105c66e450269058e19fa7692d8b55a9da06ecd1c3f6523dd25aac288efcfb4deea5089320054686d211259b2dceeb69a4e035c5720dbe2a4b97919e704547460b81390af17e2d1c9f7706a1fe9f94e295b7a88f20ca6e16fd5650adfd8f67ab343cf595c18ab9f8b9e7544a17d78696bae8738b55cc8c59d98e36ab85e54144b6bf6d2e9140515e9179e9dc8ad1e21f02f3871794c58d7dc15fe3640978be7aff101d67a9746e7b01521983d382c03abb320b951c1a7a783d8dc789d7698b6cf52a0fa2bfd09b9ddbd5e" />
-
-    <!-- com.unionpay.tsmservice -->
-    <signer android:signature="30820285308201eea00302010202044dd5ceb6300d06092a864886f70d0101050500308186310b300906035504061302434e3111300f060355040813085368616e676861693111300f060355040713085368616e67686169311f301d060355040a13164368696e6120556e696f6e50617920436f2e204c746431173015060355040b130e4368696e6120556e696f6e506179311730150603550403130e4368696e6120556e696f6e506179301e170d3131303532303032313531385a170d3431303531323032313531385a308186310b300906035504061302434e3111300f060355040813085368616e676861693111300f060355040713085368616e67686169311f301d060355040a13164368696e6120556e696f6e50617920436f2e204c746431173015060355040b130e4368696e6120556e696f6e506179311730150603550403130e4368696e6120556e696f6e50617930819f300d06092a864886f70d010101050003818d00308189028181008dc60af5457a3d204ae48409e638aeff5c5b7b2ce82d1e939b1eb8ada8d5005cf8cdb6ffc6986dde16d747b63f4455ebed5ddb24ebc3ab417e0a08385f000f67cad824ec185247cd0743eadb422579bbb2c89c81519f6bf3199c91eff18cfa3ffc18e69df18f0fdbc5f7fcf49aa225f487f3313b71de94089488b34979f923070203010001300d06092a864886f70d0101050500038181001b16499405680625ca842cab9f036b4aea57b2e51398a9c4bfcfb67c3807a7a00f42da63b5d366cdef1557a9594bf643f7edc0ce3e8b1fa5b20380f509e5fb6a0e36a350ca44d33ea9fc408b68315875db0582b3bfad8354b59f227b36bc8b22926570168cdfb6ffd7543d8ad1733253fc1b75af90b4d437f3681382de551d6b" />
-
-    <!-- com.umpay.qingdaonfc -->
-    <signer android:signature="308201e930820152a0030201020204578f360c300d06092a864886f70d01010505003038310b300906035504061302434e3110300e060355040713076265696a696e67311730150603550403130e6c69616e646f6e67796f757368693020170d3136303732303038323735365a180f32303636303730383038323735365a3038310b300906035504061302434e3110300e060355040713076265696a696e67311730150603550403130e6c69616e646f6e67796f7573686930819f300d06092a864886f70d010101050003818d0030818902818100b7cd2032df121b9e1c72cbbfa358856fe6ee0953a769473b31b87a7846c112ad1c7f2b7690aa3dc1a85852f33b9956a3e4c8f23d47ddec265c281c8df3382a00ac08e89b6a53489287f1f4f42cb6c3225b23110d3d278b6e704cb4da74f668c61da84e39b02afe50a6bb9ee4fbe38f1fba00aa7639dcaf280a65f9a0d190a99b0203010001300d06092a864886f70d01010505000381810061932a7405b391cebfbf4b9ce082b4e37e02ca9dd98c0ee86f2f1172a3fe4117901cd477abb23bf9f58051954a74efa06e423e23c78e4bcf55dec61463c01a82d84e53d76cf63c6c76c1a4c6f903e47043c71eb43daa533e4da454471aad85a3e9b4d4e2aa4d8d3c1d525d20299d05fdbe19039885d19e1018c303272225602e" />
-
-    <!-- <package android:name="com.finshell.wallet" /> -->
-    <signer android:signature="308203fb308202e3a003020102020900cffa1afdf2edb15c300d06092a864886f70d0101050500308193310b300906035504061302434e3112301006035504080c094775616e67446f6e673111300f06035504070c085368656e5a68656e310d300b060355040a0c044c65626f3111300f060355040b0c0846696e5368656c6c3115301306035504030c0c46696e5368656c6c5465616d3124302206092a864886f70d010901161566696e7368656c6c4066696e7368656c6c2e636f6d301e170d3139303832373036323232325a170d3437303131323036323232325a308193310b300906035504061302434e3112301006035504080c094775616e67446f6e673111300f06035504070c085368656e5a68656e310d300b060355040a0c044c65626f3111300f060355040b0c0846696e5368656c6c3115301306035504030c0c46696e5368656c6c5465616d3124302206092a864886f70d010901161566696e7368656c6c4066696e7368656c6c2e636f6d30820122300d06092a864886f70d01010105000382010f003082010a0282010100ab41e6522b41ebdcd636e3f190d2a8c4c4533b82bed8092f3d73f868dc342f6c8a1a84e92ec50b2fd836c22bfe94f6e444315599a4935bca120562e5cf65544326ec9dea464280135b42244b9608c630e7edb38a442395ca5b7fb56d017cfa00c961022b60f75b2bd40958ee8c372089916b55bfa0fd2a2512396816d1963aeeb4ce6f305e2c5fcd34160b45621196d36867342f88cdcba12e582477402eb317d230aa77cb9ed2ed02e62cbd3492bc4fa5bcc133bc3c6884e0f14e88273eac6ae73f3a1214f83d4c5a88c363d137b7a19f5d63e12314308180ce6fc2109efe24e6717e7675e1386ffea5b90f9cd12114f95729357a5a8dde296df3971207616d0203010001a350304e301d0603551d0e04160414c0f97daaf0fbb9fe4a52736781d2e8ad44ef6aee301f0603551d23041830168014c0f97daaf0fbb9fe4a52736781d2e8ad44ef6aee300c0603551d13040530030101ff300d06092a864886f70d01010505000382010100785c5e2bd6e87721c67fc5270a9f43d94917a5914df2467fd05c2e2b81624af37c3a45e674b0e6504cdc9b276dbac699ab68c1255e0c2388acc9e1a1c5441633d56210fcd650198a7a1a9295ee13c1c897ef7eacd19ea0e5854e9454f99611dafdf91433fa0cc07d1c9d90acc07322d990b5dd7df82f88f7cc09e130e447122f5b63e9a0cc386f59cb4106415324246f6667a7b5778e97f5f0f52a001b6d7d9fb3f83f1b8ea32dfdfb05a63073f3cda1697707adf75a9a838fc1ff4773c004e9d43b44ab9b2b83ca2b09ae28424de3ef897a2733d74c9fcb50f32a9b0c943d8e435d243a152073f3d2ac4d1ab31e32e1453560320c4b9aad19901f63efd6dee2"/>
-</resources>
diff --git a/proprietary/system_ext/app/NQNfcNci/NQNfcNci.apk b/proprietary/system_ext/app/NQNfcNci/NQNfcNci.apk
deleted file mode 100644
index 6f0088a..0000000
Binary files a/proprietary/system_ext/app/NQNfcNci/NQNfcNci.apk and /dev/null differ
diff --git a/proprietary/system_ext/etc/permissions/com.nxp.nfc.nq.xml b/proprietary/system_ext/etc/permissions/com.nxp.nfc.nq.xml
deleted file mode 100644
index 18a2c62..0000000
--- a/proprietary/system_ext/etc/permissions/com.nxp.nfc.nq.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (c) 2015, The Linux Foundation. All rights reserved.
--->
-
-<!-- Assist library for NQ NFC extensions. -->
-<permissions>
-    <library name="com.nxp.nfc.nq"
-        file="/system/system_ext/framework/com.nxp.nfc.nq.jar" />
-</permissions>
diff --git a/proprietary/system_ext/framework/com.nxp.nfc.nq.jar b/proprietary/system_ext/framework/com.nxp.nfc.nq.jar
deleted file mode 100644
index 6235b10..0000000
Binary files a/proprietary/system_ext/framework/com.nxp.nfc.nq.jar and /dev/null differ
diff --git a/proprietary/system_ext/lib64/libnqnfc-nci.so b/proprietary/system_ext/lib64/libnqnfc-nci.so
deleted file mode 100644
index 125b7c9..0000000
Binary files a/proprietary/system_ext/lib64/libnqnfc-nci.so and /dev/null differ
diff --git a/proprietary/system_ext/lib64/libnqnfc_nci_jni.so b/proprietary/system_ext/lib64/libnqnfc_nci_jni.so
deleted file mode 100644
index 7e3a315..0000000
Binary files a/proprietary/system_ext/lib64/libnqnfc_nci_jni.so and /dev/null differ
diff --git a/sm8250-common-vendor.mk b/sm8250-common-vendor.mk
index cdedf64..464f63a 100644
--- a/sm8250-common-vendor.mk
+++ b/sm8250-common-vendor.mk
@@ -6,7 +6,6 @@ PRODUCT_SOONG_NAMESPACES += \
     vendor/oneplus/sm8250-common
 
 PRODUCT_COPY_FILES += \
-    vendor/oneplus/sm8250-common/proprietary/system/etc/nfcee_access.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/nfcee_access.xml \
     vendor/oneplus/sm8250-common/proprietary/system/etc/permissions/privapp-permissions-qti.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-qti.xml \
     vendor/oneplus/sm8250-common/proprietary/system/etc/sysconfig/qti_whitelist.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/qti_whitelist.xml \
     vendor/oneplus/sm8250-common/proprietary/system_ext/bin/dpmd:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/dpmd \
@@ -15,7 +14,6 @@ PRODUCT_COPY_FILES += \
     vendor/oneplus/sm8250-common/proprietary/system_ext/etc/init/dpmd.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/dpmd.rc \
     vendor/oneplus/sm8250-common/proprietary/system_ext/etc/init/wfdservice.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/wfdservice.rc \
     vendor/oneplus/sm8250-common/proprietary/system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.android.hotwordenrollment.common.util.xml \
-    vendor/oneplus/sm8250-common/proprietary/system_ext/etc/permissions/com.nxp.nfc.nq.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.nxp.nfc.nq.xml \
     vendor/oneplus/sm8250-common/proprietary/system_ext/etc/permissions/com.qti.dpmframework.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.qti.dpmframework.xml \
     vendor/oneplus/sm8250-common/proprietary/system_ext/etc/permissions/dpmapi.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/dpmapi.xml \
     vendor/oneplus/sm8250-common/proprietary/system_ext/etc/permissions/qcrilhook.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/qcrilhook.xml \
@@ -72,8 +70,6 @@ PRODUCT_COPY_FILES += \
     vendor/oneplus/sm8250-common/proprietary/system_ext/lib64/libmmparser_lite.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmmparser_lite.so \
     vendor/oneplus/sm8250-common/proprietary/system_ext/lib64/libmmrtpdecoder.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmmrtpdecoder.so \
     vendor/oneplus/sm8250-common/proprietary/system_ext/lib64/libmmrtpencoder.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmmrtpencoder.so \
-    vendor/oneplus/sm8250-common/proprietary/system_ext/lib64/libnqnfc-nci.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libnqnfc-nci.so \
-    vendor/oneplus/sm8250-common/proprietary/system_ext/lib64/libnqnfc_nci_jni.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libnqnfc_nci_jni.so \
     vendor/oneplus/sm8250-common/proprietary/system_ext/lib64/libwfdclient.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfdclient.so \
     vendor/oneplus/sm8250-common/proprietary/system_ext/lib64/libwfdcommonutils.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfdcommonutils.so \
     vendor/oneplus/sm8250-common/proprietary/system_ext/lib64/libwfdconfigutils.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfdconfigutils.so \
@@ -1143,7 +1139,6 @@ PRODUCT_PACKAGES += \
     PowerOffAlarm \
     HotwordEnrollmentOKGoogleHEXAGON \
     HotwordEnrollmentXGoogleHEXAGON \
-    NQNfcNci \
     QtiTelephonyService \
     WfdService \
     ims \
@@ -1152,7 +1147,6 @@ PRODUCT_PACKAGES += \
     qcnvitems \
     tcmclient \
     com.android.hotwordenrollment.common.util \
-    com.nxp.nfc.nq \
     com.qti.dpmframework \
     dpmapi \
     qcrilhook \