Remove more RSSI Refs