[SG] - some clean up
[SG] - added stream/:id/batch