diff --git a/proprietary-files.txt b/proprietary-files.txt
index d9dce48..64db6fe 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -268,10 +268,8 @@ vendor/lib64/vendor.qti.latency@2.1.so
 vendor/lib64/vendor.qti.latency@2.2.so
 
 # Camera
-vendor/bin/hw/android.hardware.camera.provider@2.7-external-service
 vendor/bin/hw/vendor.samsung.hardware.camera.provider-service_64
 vendor/etc/external_camera_config.xml
-vendor/etc/init/android.hardware.camera.provider@2.7-external-service.rc
 vendor/etc/init/camera.unihal.rc
 vendor/etc/init/vendor.samsung.hardware.camera.provider-service_64.rc
 vendor/etc/permissions/vendor.android.hardware.camera.preview-dis.back.xml
@@ -606,9 +604,6 @@ system_ext/etc/seccomp_policy/tcmd.policy
 vendor/lib64/com.qualcomm.qti.dpm.api@1.0.so
 
 # DRK
-vendor/bin/hw/vendor.samsung.hardware.security.drk@2.0-service
-vendor/etc/init/vendor.samsung.hardware.security.drk@2.0-service.rc
-vendor/lib64/libdk_vnd_service_core.so
 vendor/lib64/vendor.samsung.hardware.security.drk-V1-ndk.so
 vendor/lib64/vendor.samsung.hardware.security.drk@2.0.so
 
@@ -778,14 +773,6 @@ vendor/lib64/libsfp_teegw.so
 vendor/lib64/libsynaFpSensorTestNwd.so
 vendor/lib64/vendor.samsung.hardware.biometrics.fingerprint-V1-ndk.so
 
-# Frcmc
-vendor/bin/hw/vendor.samsung.hardware.frcmc-service
-vendor/etc/init/vendor.samsung.hardware.frcmc-service.rc
-vendor/etc/vintf/manifest/vendor.samsung.hardware.frcmc-service.xml
-vendor/lib64/libdspmc_qc.so
-vendor/lib64/libdspmc_wrapper.so
-vendor/lib64/vendor.samsung.hardware.frcmc-V1-ndk.so
-
 # GNSS
 vendor/bin/hw/android.hardware.gnss-aidl-service-qti
 vendor/bin/loc_launcher
@@ -949,15 +936,11 @@ vendor/etc/init/hw/init.qti.kernel.rc
 
 # Keymaster
 vendor/bin/hw/android.hardware.keymaster@4.0-strongbox-service-qti
-vendor/bin/vendor.samsung.hardware.security.fkeymaster-service
 vendor/etc/init/android.hardware.keymaster@4.0-strongbox-service-qti.rc
-vendor/etc/init/vendor.samsung.hardware.security.fkeymaster-service.rc
-vendor/etc/vintf/manifest/vendor.samsung.hardware.security.fkeymaster-service.xml
 vendor/lib64/libkeymasterdeviceutils.so
 vendor/lib64/libkeymasterutils.so
 vendor/lib64/libqtikeymaster4.so
 vendor/lib64/libspcom.so
-vendor/lib64/vendor.samsung.hardware.security.fkeymaster-V1-ndk.so
 
 # Keymint
 vendor/bin/hw/android.hardware.security.keymint-service
diff --git a/vendor.prop b/vendor.prop
index edb4254..ba0dd76 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -143,9 +143,6 @@ ro.surface_flinger.use_color_management=true
 ro.surface_flinger.use_content_detection_for_refresh_rate=true
 ro.surface_flinger.wcg_composition_dataspace=143261696
 
-# HDM status
-ro.vendor.hdm.supported.swblock=0x100
-
 # Incremental FS
 ro.incremental.enable=yes
 
@@ -220,9 +217,6 @@ vendor.usb.rndis.func.name=gsi
 vendor.usb.use_ffs_mtp=1
 vendor.usb.use_gadget_hal=1
 
-# UWB
-ro.vendor.uwb.feature.chipname=sr200
-
 # WiFi
 wifi.aware.interface=wifi-aware0
 
diff --git a/vintf/device_framework_matrix.xml b/vintf/device_framework_matrix.xml
index 07a5349..c634d40 100644
--- a/vintf/device_framework_matrix.xml
+++ b/vintf/device_framework_matrix.xml
@@ -101,20 +101,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="aidl" optional="true">
-        <name>vendor.samsung.hardware.frcmc</name>
-        <interface>
-            <name>ISehFrcMc</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="aidl" optional="true">
-        <name>vendor.samsung.hardware.security.fkeymaster</name>
-        <interface>
-            <name>ISehFkeymaster</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.samsung.hardware.nfc</name>
         <version>2.0</version>