Clean up DeviceFactory to remove bluetooth specific code.