cleanup api calls