i9500: clean-up wi-fi stuff