diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 6f8b43bc..82b96de6 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -342,21 +342,6 @@ BOARD_VNDK_VERSION := current
 # H/W align restriction of MM IPs
 BOARD_EXYNOS_S10B_FORMAT_ALIGN := 64
 
-# WiFi
-BOARD_WLAN_DEVICE := bcmdhd
-BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_bcmdhd
-BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_bcmdhd
-WPA_SUPPLICANT_VERSION := VER_0_8_X
-BOARD_WPA_SUPPLICANT_DRIVER := NL80211
-BOARD_HOSTAPD_DRIVER := NL80211
-# Wifi interface combination - {1 STA + 1 AP (bridged or single)} or {2 STA + 1 of (P2P or NAN)}
-WIFI_HAL_INTERFACE_COMBINATIONS := {{{STA}, 1}, {{AP}, 1}}, {{{STA}, 2}, {{P2P, NAN}, 1}}
-WIFI_FEATURE_WIFI_EXT_HAL := true
-WIFI_FEATURE_IMU_DETECTION := true
-# Avoid Wifi reset on MAC Address change
-WIFI_AVOID_IFACE_RESET_MAC_CHANGE := true
-WIFI_FEATURE_HOSTAPD_11AX := true
-
 # NeuralNetworks
 GPU_SOURCE_PRESENT := $(wildcard vendor/arm/mali/valhall)
 GPU_PREBUILD_PRESENT := $(wildcard vendor/google_devices/zebu/prebuilts/libs)
diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc
index 8b84b1b5..3398af6e 100644
--- a/conf/init.gs201.rc
+++ b/conf/init.gs201.rc
@@ -328,8 +328,6 @@ on post-fs-data
     chmod 0664 /sys/devices/platform/1c2d0000.drmdsim/hs_clock
 
     setprop vold.post_fs_data_done 1
-    setprop wifi.direct.interface p2p-dev-wlan0
-    setprop wifi.aware.interface aware_nmi0
 
     # IPSEC PIDDIR for VoWiFi
     mkdir /data/vendor/misc 0771 root system
@@ -470,10 +468,6 @@ on boot
     chmod 0660 /sys/devices/platform/13810000.vts/vts_svoice_model
     chmod 0660 /sys/devices/platform/13810000.vts/vts_google_model
 
-# WLAN firmware/driver path
-    chown wifi wifi /sys/module/bcmdhd/parameters/nvram_path
-    chown wifi wifi /sys/module/bcmdhd/parameters/firmware_path
-
 on property:persist.vendor.radio.no_modem_board=1
     setprop ro.radio.noril yes
 
@@ -551,21 +545,6 @@ service abox /vendor/bin/main_abox 17c50000.abox
     group audioserver
     seclabel u:r:abox:s0
 
-service wpa_supplicant /vendor/bin/hw/wpa_supplicant \
-    -O/data/vendor/wifi/wpa/sockets -puse_p2p_group_interface=1p2p_device=1 \
-    -m/vendor/etc/wifi/p2p_supplicant.conf \
-    -g@android:wpa_wlan0 -dd
-    interface android.hardware.wifi.supplicant@1.0::ISupplicant default
-    interface android.hardware.wifi.supplicant@1.1::ISupplicant default
-    interface android.hardware.wifi.supplicant@1.2::ISupplicant default
-    interface android.hardware.wifi.supplicant@1.3::ISupplicant default
-    interface android.hardware.wifi.supplicant@1.4::ISupplicant default
-    socket wpa_wlan0 dgram 660 wifi wifi
-    class main
-    disabled
-    oneshot
-
-
 # GPS
 service lhd /vendor/bin/hw/lhd /vendor/etc/gnss/lhd.conf
     class main
diff --git a/device.mk b/device.mk
index 7d804068..7ffe193c 100644
--- a/device.mk
+++ b/device.mk
@@ -651,11 +651,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
 
 PRODUCT_CHARACTERISTICS := nosdcard
 
-# WPA SUPPLICANT
-PRODUCT_COPY_FILES += \
-	device/google/gs201/wifi/p2p_supplicant.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant.conf \
-	device/google/gs201/wifi/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf
-
 # WIFI COEX
 PRODUCT_COPY_FILES += \
 	device/google/gs201/wifi/coex_table.xml:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/coex_table.xml
diff --git a/wifi/p2p_supplicant.conf b/wifi/p2p_supplicant.conf
deleted file mode 100644
index 2f0bc1b2..00000000
--- a/wifi/p2p_supplicant.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-driver_param=use_p2p_group_interface=1p2p_device=1
-update_config=1
-eapol_version=1
-ap_scan=1
-fast_reauth=1
-pmf=1
-p2p_add_cli_chan=1
-disable_scan_offload=1
-p2p_go_vht=1
diff --git a/wifi/wpa_supplicant_overlay.conf b/wifi/wpa_supplicant_overlay.conf
deleted file mode 100644
index 6f274c1a..00000000
--- a/wifi/wpa_supplicant_overlay.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-sae_pwe=2
-driver_param=use_p2p_group_interface=1p2p_device=1
-disable_scan_offload=1
-wowlan_triggers=any
-bss_max_count=512
-interworking=1
-hs20=1
-auto_interworking=0
-bss_no_flush_when_down=1
-btm_offload=1