I use ClorAm-X for chlorine and chloramine removal. It's FDA approved for fish intended for human consumption, and it's very cheap per treatment.