clean up API calls