Clean unneeded api calls