AD2: Cleanup Wireless Logic

I have to admit I don't really understand all of the optional settings for wireless objects
Merge branch 'ad2usb' into running