Remove stream also from water_gen0/1 (cf #226)