Wean bedtime bottles

My son is 17 months old, I know I know he doesn't need a bottle at this age. BUT he takes one to fall asleep and sometimes if he wakes up in the middle of the night he needs one to go back to sleep. We have baby #2 due in 5 weeks and I'm desperate. I want to get him off the bottle so he will go to sleep on his own and sleep through the night.

We have used CIO and it only works if he's had a bottle but still awake and drowsy. If he's tired and I try to lay him down he just gets more upset and won't go to sleep.

His bottles only have 1-2 oz of mile and the rest water so I've cut them down in hopes he won't want it anymore.