Refactor DeviceConfig
Remove testing code
Simplify the process of adding a device to devicemanager