Remove device names, we now just find it via USB ids.