I would reccomend that you epoxy the inside surface of the tank. Then bleach the heck out of it. By the time the chlorine taste goes away, you''ll be happy with the flavor. Don''t run a heavily chlorinated solution thru your water pump. It has a tendency to eat rubber.