Cleanups after new WIFI Driver merge.