Remove extraneous device_id assignment