Clean up wifi

Change-Id: Ib1ac2736b21cbe19aebfa25614dacd9482bdf89a