Merge "Wifi: remove dead code"