diff --git a/device.mk b/device.mk
index 6aea4918..c982384d 100755
--- a/device.mk
+++ b/device.mk
@@ -93,7 +93,6 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/uinput-fpc.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/uinput-fpc.idc \
     $(LOCAL_PATH)/init.qcom.devstart.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.qcom.devstart.sh \
     $(LOCAL_PATH)/init.qcom.ipastart.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.qcom.ipastart.sh \
-    $(LOCAL_PATH)/init.qcom.wlan.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.qcom.wlan.sh \
     $(LOCAL_PATH)/init.insmod.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.insmod.sh \
     $(LOCAL_PATH)/init.ramoops.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.ramoops.sh \
     frameworks/native/services/vr/virtual_touchpad/idc/vr-virtual-touchpad-0.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/vr-virtual-touchpad-0.idc \
diff --git a/init.hardware.rc b/init.hardware.rc
index 522a8ffd..2a457155 100644
--- a/init.hardware.rc
+++ b/init.hardware.rc
@@ -815,13 +815,6 @@ service vendor.devstart_sh /vendor/bin/init.qcom.devstart.sh
     disabled
     oneshot
 
-service vendor.wlan_sh /vendor/bin/init.qcom.wlan.sh
-    class main
-    user root
-    group root
-    disabled
-    oneshot
-
 service vendor.ipastart_sh /vendor/bin/init.qcom.ipastart.sh
     class main
     user system
@@ -851,10 +844,6 @@ on property:sys.vdso=64
 on property:sys.vdso=32
    write /sys/module/vdso/parameters/enable_64 0
 
-on property:wlan.driver.status=ok
-   # Get the wlan driver/fw version
-   start vendor.wlan_sh
-
 # charger driver exposes now finer grain control, map demo mode to those properties
 # demo mode can only be exit wipping data which will also reset the persist properties
 on property:sys.retaildemo.enabled=1
diff --git a/init.qcom.wlan.sh b/init.qcom.wlan.sh
deleted file mode 100644
index 0d14fabf..00000000
--- a/init.qcom.wlan.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#! /vendor/bin/sh
-
-wlan_driver_version=`cat /sys/kernel/wifi/wlan/driver_version`
-setprop vendor.wlan.driver.version "$wlan_driver_version"
-wlan_fw_version=`cat /sys/kernel/wifi/wlan/fw/0/version`
-setprop vendor.wlan.firmware.version "$wlan_fw_version"
diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts
index 8011c8f8..b66f65ae 100644
--- a/sepolicy/vendor/file_contexts
+++ b/sepolicy/vendor/file_contexts
@@ -174,7 +174,6 @@
 /vendor/bin/imsrcsd             u:object_r:hal_rcsservice_exec:s0
 /vendor/bin/init\.qcom\.devstart\.sh                                 u:object_r:init-qcom-devstart-sh_exec:s0
 /vendor/bin/init\.qcom\.ipastart\.sh                                 u:object_r:init-qcom-ipastart-sh_exec:s0
-/vendor/bin/init\.qcom\.wlan\.sh                                     u:object_r:init-qcom-wlan-sh_exec:s0
 /vendor/bin/init\.insmod\.sh                                         u:object_r:init-insmod-sh_exec:s0
 /vendor/etc/init\.insmod\.cfg                                        u:object_r:init-insmod-sh_exec:s0
 /vendor/bin/init\.power\.sh     u:object_r:init_power_exec:s0
diff --git a/sepolicy/vendor/hal_wifi_default.te b/sepolicy/vendor/hal_wifi_default.te
index a0155584..d6f02d59 100644
--- a/sepolicy/vendor/hal_wifi_default.te
+++ b/sepolicy/vendor/hal_wifi_default.te
@@ -11,6 +11,9 @@ allow hal_wifi_default wlan_device:chr_file w_file_perms;
 # Allow wifi hal to read debug info from the driver.
 r_dir_file(hal_wifi_default, proc_wifi_dbg)
 
+# Write wlan driver/fw version into property
+set_prop(hal_wifi_default, vendor_wifi_version)
+
 dontaudit hal_wifi_default kernel:system module_request;
 dontaudit hal_wifi_default self:capability sys_module;
 
@@ -19,4 +22,4 @@ userdebug_or_eng(`
 
 # Allow wifi hal to access wlan debugfs files and directories
 allow hal_wifi_default debugfs_wlan:dir r_dir_perms;
-')
\ No newline at end of file
+')
diff --git a/sepolicy/vendor/init-wlan-sh.te b/sepolicy/vendor/init-wlan-sh.te
deleted file mode 100644
index 3380c861..00000000
--- a/sepolicy/vendor/init-wlan-sh.te
+++ /dev/null
@@ -1,14 +0,0 @@
-type init-qcom-wlan-sh, domain;
-type init-qcom-wlan-sh_exec, exec_type, vendor_file_type, file_type;
-
-init_daemon_domain(init-qcom-wlan-sh)
-
-allow init-qcom-wlan-sh vendor_shell_exec:file rx_file_perms;
-allow init-qcom-wlan-sh vendor_toolbox_exec:file rx_file_perms;
-
-# Set the vendor.wlan.driver.version and vendor.wlan.firmware.version property
-set_prop(init-qcom-wlan-sh, vendor_wifi_version)
-
-# /sys/kernel/wifi/wlan/driver_version and /sys/kernel/wifi/wlan/fw/0/version
-allow init-qcom-wlan-sh sysfs_msm_wlan:dir r_dir_perms;
-allow init-qcom-wlan-sh sysfs_msm_wlan:file r_file_perms;