feature: api cleanup