remove extra calls to the API