Removed unecessary fetching