Stream selector

Left unintentionally - removed