Raw water treatment