Toddlers and bottles

My 1.5 yr. Son still takes a bottle of 2% milk. I was thinking about ditching the bottle and switching to sippy cups. However he likes a bottle when he goes to bed (no he doesn't sleep with it in his mouth or anything of that sorts). I'm wondering if once we switch should I refrain from giving him a cup to bed ? It doesn't matter if we say no or don't let him or even if he had milk before bed he will get up in the middle of the night and cry staring at the cupboard he knows his bottles and cups are in.