Remove use of getDeviceBaseAddrs and GMap