classify: api cleanup