I used to use Ultra-Swim. Got rid of the chlorine smell too.

Too bad they don't make eye drops.