More wifi cleanup

Change-Id: Iac1ddecd1f61bc719a00fbfa2bff9ebb81aef3e5