Remove some of the ibeacon references