update importer to use bssid and unrelated cleanup