My Dd is nearly 17 months and still has a bottle at bedtime, but has water in a beaker/sippie cup. Just wondering when I should stop her bedtime bottle or start giving her it in her cup before bed?