track removed streams for msg passing, whitespace cleanup