diff --git a/components.mk b/components.mk
index 9b553227..b3d73ce9 100644
--- a/components.mk
+++ b/components.mk
@@ -123,6 +123,5 @@ ifneq (,$(filter wfd, $(TARGET_COMMON_QTI_COMPONENTS)))
 endif
 
 ifneq (,$(filter wlan, $(TARGET_COMMON_QTI_COMPONENTS)))
-  include $(QCOM_COMMON_PATH)/system/wlan/qti-wlan.mk
   include $(QCOM_COMMON_PATH)/vendor/wlan/qti-wlan.mk
 endif
diff --git a/system/wlan/extract-files.sh b/system/wlan/extract-files.sh
deleted file mode 100755
index 354b204e..00000000
--- a/system/wlan/extract-files.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2018-2019 The LineageOS Project
-# Copyright (C) 2020 Paranoid Android
-#
-# 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.
-#
-
-# If we're being sourced by the common script that we called,
-# stop right here. No need to go down the rabbit hole.
-if [ "${BASH_SOURCE[0]}" != "${0}" ]; then
-    return
-fi
-
-set -e
-
-# Required!
-export COMPONENT=wlan
-export VENDOR=qcom/common/system
-
-"../extract-files.sh" "$@"
diff --git a/system/wlan/proprietary-files.txt b/system/wlan/proprietary-files.txt
deleted file mode 100644
index 0667224f..00000000
--- a/system/wlan/proprietary-files.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# WIGIG
-system_ext/framework/vendor.qti.hardware.wigig.netperftuner-V1.0-java.jar
-system_ext/framework/vendor.qti.hardware.wigig.supptunnel-V1.0-java.jar
-system_ext/lib/vendor.qti.hardware.wigig.netperftuner@1.0.so
-system_ext/lib/vendor.qti.hardware.wigig.supptunnel@1.0.so
-system_ext/lib64/vendor.qti.hardware.wigig.netperftuner@1.0.so
-system_ext/lib64/vendor.qti.hardware.wigig.supptunnel@1.0.so
diff --git a/system/wlan/qti-wlan.mk b/system/wlan/qti-wlan.mk
deleted file mode 100644
index d1da2dde..00000000
--- a/system/wlan/qti-wlan.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright (C) 2021 Paranoid Android
-#
-# 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.
-
-# Get non-open-source specific aspects.
-$(call inherit-product-if-exists, vendor/qcom/common/system/wlan/wlan-vendor.mk)
diff --git a/system/wlan/setup-makefiles.sh b/system/wlan/setup-makefiles.sh
deleted file mode 100755
index bb023166..00000000
--- a/system/wlan/setup-makefiles.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2018-2019 The LineageOS Project
-# Copyright (C) 2020 Paranoid Android
-#
-# 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.
-#
-
-set -e
-
-# Required!
-export COMPONENT=wlan
-export VENDOR=qcom/common/system
-
-"../setup-makefiles.sh" "$@"
diff --git a/vendor/wlan/proprietary-files.txt b/vendor/wlan/proprietary-files.txt
index 1a76ac48..32b15323 100644
--- a/vendor/wlan/proprietary-files.txt
+++ b/vendor/wlan/proprietary-files.txt
@@ -1,26 +1,3 @@
-# WIGIG
-vendor/bin/ftm_flows_test
-vendor/bin/ftmtest
-vendor/bin/host_manager_11ad
-vendor/bin/shell_11ad
-vendor/bin/wigig_wiburn
-vendor/bin/wigighalsvc
-vendor/bin/wigignpt
-vendor/etc/configstore/wigig.xml
-vendor/etc/init/vendor.qti.hardware.wigig.supptunnel@1.0-service.rc
-vendor/etc/wifi/aoa_cldb_falcon.bin
-vendor/etc/wifi/aoa_cldb_swl14.bin
-vendor/etc/wifi/wigig_p2p_supplicant.conf
-vendor/etc/wifi/wigig_supplicant.conf
-vendor/firmware/wigig/wigig.ini
-vendor/lib64/libaoa.so
-vendor/lib64/libwigig_flashaccess.so
-vendor/lib64/libwigig_ftm_flows.so
-vendor/lib64/libwigig_pciaccess.so
-vendor/lib64/libwigig_utils.so
-vendor/lib64/vendor.qti.hardware.wigig.netperftuner@1.0.so
-vendor/lib64/vendor.qti.hardware.wigig.supptunnel@1.0.so
-
 # WLAN
 vendor/bin/athdiag
 vendor/bin/cnss-daemon