Some wifi clean up

Change-Id: I3d42ac48a947db7be28afacdf9e9b502922521a0