Fix no-stream support in watch console
Remove dead code from stream console