Yup, but sometimes you crave something with a bit more flavour... but also have to be mindful about piling on sugar as well.
What I do now is buy a 1L carton of freshly squeeze orange juice, dilute it by 1/2 - 1/3 and just drink that. Quenches your thirst, good for you (Vitamin C), and with the dilution you don't consume as much sugar as you would otherwise.
I crave beer. That's the only sugary drink I drink. If I drink three sodas a year I'd be surprised. And I used to drink fruit juice but turns out that stuff isn't really all that good for you, so if I want fruit I eat whole fruit (fiber matters).
I live life by a simple mantra: Coffee in the morning (and only in the morning), water throughout the day (the more the better), beer at night (keep it reasonable). And that's been how I've done it the better part of the last 15 years.