Removed extra api call