g3-common: clean-up wi-fi