Chlorine and fluoride removal