Cleaned up Trusted Wifi