Nice! I'm still working on that one.
For me, it was deciding that water is my primary beverage and all others are rare treats or supplements. I only use water to address thirst specifically. If I need electrolytes for some reason, I just use hydration salts. I feel a lot better and it saves a bit of money. The dental hygiene aspect is a plus, too. I file caffeinated drinks under supplements and save them for an emergency boost when I need it.