add todos, remove obsolete DeviceInfo json reads