Remove unneeded API calls