Got rid of device field of internal json structure.