Removing custom stream handling