more api cleanup