It would be really nice if it was designed so that the devices themselves were their own entities with their own unique identifier. They could do their own polling and monitoring on the device itself. Then you could just drop a reference to that device on the map, remove the reference on the map, or...