Removed a lot of stream fetching logic