Did some cleanup of streamers