Remove extraneous API calls