Removed unecessary api calls