WiFi fix update and cleanup