Removing some API calls because of the API limit

Removing some API calls because of the API limit