Better place for cleaning up stream table #223