devices: api cleanup