removed extra api calls