I gave up coffee, tea and anything else with caffeine, and drink water all day. No set amount, just whenever I feel like it. I fall asleep much more quickly at night.
I still knock down some soda, but generally not more than 40 ounces in a day and not after 2 PM. The rest is almost all water. The body is a much happier thing on water than most other stuff we drink.