Begin to consolidate of_device.c