discover/device-handler: Remove default option if device removed