Correct stream_filter_remove calls