Unsubscribe code, still have to fix the identical stream being subscribe...

...d twice bug# 7333