some api cleanup