restructure
remove filters on stream close