remove dependency on hard-coded beacons