clean up some apis