some cleanup# On branch streaming-fixes