Removing unecessary stream fetching