More wifi cleanup

Change-Id: I467221401f4d0912df6c4f80352ef2dc7e78da9d