removing extraneous cruft, wifiap stuffs