diff --git a/whitechapel/vendor/google/device.te b/whitechapel/vendor/google/device.te
index 94ec0bb4..7a70e332 100644
--- a/whitechapel/vendor/google/device.te
+++ b/whitechapel/vendor/google/device.te
@@ -42,9 +42,6 @@ type fingerprint_device, dev_type;
 # AMCS device
 type amcs_device, dev_type;
 
-# Battery history
-type battery_history_device, dev_type;
-
 # Raw HID device
 type hidraw_device, dev_type;
 
diff --git a/whitechapel/vendor/google/file.te b/whitechapel/vendor/google/file.te
index 847499d1..ff41adfe 100644
--- a/whitechapel/vendor/google/file.te
+++ b/whitechapel/vendor/google/file.te
@@ -78,7 +78,6 @@ type updated_wifi_firmware_data_file, file_type, data_file_type;
 type mediadrm_vendor_data_file, file_type, data_file_type;
 
 # Storage Health HAL
-type sysfs_scsi_devices_0000, sysfs_type, fs_type;
 type debugfs_f2fs, debugfs_type, fs_type;
 type proc_f2fs, proc_type, fs_type;
 
@@ -141,9 +140,6 @@ userdebug_or_eng(`
 type sysfs_gps, sysfs_type, fs_type;
 type sysfs_gps_assert, sysfs_type, fs_type;
 
-# Display
-type sysfs_display, sysfs_type, fs_type;
-
 # Backlight
 type sysfs_backlight, sysfs_type, fs_type;
 
@@ -160,7 +156,6 @@ type sysfs_bcl, sysfs_type, fs_type;
 # Chosen
 type sysfs_chosen, sysfs_type, fs_type;
 
-type sysfs_chip_id, sysfs_type, fs_type;
 type sysfs_spi, sysfs_type, fs_type;
 
 # Battery
@@ -186,9 +181,6 @@ type uwb_vendor_data_file, file_type, data_file_type, app_data_file_type;
 type persist_uwb_file, file_type, vendor_persist_type;
 type uwb_data_vendor, file_type, data_file_type;
 
-# PixelStats_vendor
-type sysfs_pixelstats, fs_type, sysfs_type;
-
 # WLC FW
 type vendor_wlc_fwupdata_file, vendor_file_type, file_type;
 
diff --git a/whitechapel/vendor/google/genfs_contexts b/whitechapel/vendor/google/genfs_contexts
index 493e5af9..ba9aa72d 100644
--- a/whitechapel/vendor/google/genfs_contexts
+++ b/whitechapel/vendor/google/genfs_contexts
@@ -398,6 +398,10 @@ genfscon sysfs /devices/platform/17000080.devfreq_bo/devfreq/17000080.devfreq_bo
 genfscon sysfs /devices/platform/17000060.devfreq_tnr/devfreq/17000060.devfreq_tnr/time_in_state        u:object_r:sysfs_cpu:s0
 genfscon sysfs /devices/platform/17000070.devfreq_mfc/devfreq/17000070.devfreq_mfc/time_in_state        u:object_r:sysfs_cpu:s0
 
+genfscon sysfs /devices/system/chip-id/unique_id                                                        u:object_r:sysfs_soc:s0
+genfscon sysfs /devices/soc0/machine                                                                    u:object_r:sysfs_soc:s0
+genfscon sysfs /devices/soc0/revision                                                                   u:object_r:sysfs_soc:s0
+
 # Devfreq directory
 genfscon sysfs /class/devfreq                                                                           u:object_r:sysfs_devfreq_dir:s0
 
diff --git a/whitechapel/vendor/google/hardware_info_app.te b/whitechapel/vendor/google/hardware_info_app.te
deleted file mode 100644
index 80b53377..00000000
--- a/whitechapel/vendor/google/hardware_info_app.te
+++ /dev/null
@@ -1,24 +0,0 @@
-type hardware_info_app, domain;
-
-app_domain(hardware_info_app)
-
-allow hardware_info_app app_api_service:service_manager find;
-
-# Display
-allow hardware_info_app sysfs_display:dir search;
-allow hardware_info_app sysfs_display:file r_file_perms;
-
-# Audio
-allow hardware_info_app sysfs_pixelstats:dir search;
-allow hardware_info_app sysfs_pixelstats:file r_file_perms;
-
-# Storage
-allow hardware_info_app sysfs_scsi_devices_0000:dir search;
-allow hardware_info_app sysfs_scsi_devices_0000:file r_file_perms;
-
-# Battery
-allow hardware_info_app sysfs_batteryinfo:file r_file_perms;
-allow hardware_info_app sysfs_batteryinfo:dir search;
-
-# SoC
-allow hardware_info_app sysfs:file r_file_perms;
diff --git a/whitechapel/vendor/google/seapp_contexts b/whitechapel/vendor/google/seapp_contexts
index f866e37a..7c016d15 100644
--- a/whitechapel/vendor/google/seapp_contexts
+++ b/whitechapel/vendor/google/seapp_contexts
@@ -26,9 +26,6 @@ user=_app isPrivApp=true name=com.google.android.grilservice domain=grilservice_
 # HbmSVManager
 user=_app seinfo=platform name=com.android.hbmsvmanager domain=hbmsvmanager_app type=app_data_file levelFrom=all
 
-# Hardware Info Collection
-user=_app isPrivApp=true name=com.google.android.hardwareinfo domain=hardware_info_app type=app_data_file levelFrom=user
-
 # Domain for omadm
 user=_app isPrivApp=true seinfo=platform name=com.android.omadm.service domain=omadm_app type=app_data_file levelFrom=all