[MERGE] Add cleanup index by stream id

Signed-off-by: David Goulet <dgoulet@efficios.com>