sr: api cleanup