Friday spring clean of WifiHandler