Ummm No. I've seen you been giving a fair amount of water advice and been completely wrong.
To the OP, don't sweat the chlorine. In the US, the EPA requires your municipality to send you an annual water report. Theres plenty of guidelines. And if you haven't seen one, call them up. Asking...