Index: scripts/factory_reset.sh
===================================================================
diff -u -r891ea20a0f6e25eb03c21c6b4fb67e9137a49c14 -r692e589e79748c24dee45865ec5aeccea3a79d02
--- scripts/factory_reset.sh	(.../factory_reset.sh)	(revision 891ea20a0f6e25eb03c21c6b4fb67e9137a49c14)
+++ scripts/factory_reset.sh	(.../factory_reset.sh)	(revision 692e589e79748c24dee45865ec5aeccea3a79d02)
@@ -19,6 +19,7 @@
 # @details
 #  This file is called by UI Software to remove and reset the device
 
+
 #TODO This script needs to be integrated with the globals.sh
 
 ERR_REMOVE_PRM_DIR=150
@@ -152,11 +153,13 @@
 }
 
 function deleteWiFi() {
-    removeSingleFile    $LOC_WIFI_CONFIGURATION "WiFi configuration"    #delete WiFi
+    SCRIPTS=/home/$(whoami)/scripts
+    $SCRIPTS/wifi_disconnect_network.sh wlan0
 }
 
 function deleteBluetooth() {
-    clearFolderContent  $LOC_BLUETOOTH_DEVCACHE "Bluetooth cache"       #delete Bluetooth
+    SCRIPTS=/home/$(whoami)/scripts
+    $SCRIPTS/bluetooth_paired_clear.sh
 }
 
 function defaultSettings() {