flow: api cleanup