Removed unnecessary stream creations