Wifi cleanup

Change-Id: Ie19868a5edf89431daf55a48494d335ddd13c15b