Remove unnecessary filter on datastreams