remove more api calls