When DD1 wakes I only sit at the end of her bed or next to her bed, I won't hop in and cuddle her (even though I want to). Too rewarding for a cuddle!
I also do rewards in the morning if she sleeps in her own bed all night. DD1 has just turned 3 and is addicted to the lullabies feature on the monitor. I have to play it when she goes to sleep each night and sometimes when she wakes up. Yeah it's not ideal, but it gets me out of her room. My motto is whatever gets me out of the room fastest!
I had to drop her nap right back at about 18 months. I wouldn't let him sleep more than 2 hours and not past 2.30. It's brutal but it helped our nights.