If possible, is good to cut on caffeine as well. Not much of a problem for me because I always refused to get into the "need to wake up" circle.
The trainer that did my assessment said caffeine makes you thirsty, but I had reduced my intake of tea already months ago because of how powerful it is in colouring teeth. Since I've started gym I'm down to one cup every two-three days probably.