clean up api calls.
clean up api calls