CLR will remove water stains and calcium deposits. We use it on our chrome faucets and shower hardware. Try it on a very small spot first.
Good luck