Removed hacks for RSSI and major/minor number