Well, if she's hitting the point that she doesn't need naps, then she's probably going to be able to wear herself out a bit more as the days go on. Try getting a digital clock and tell her that until the first number says 7 (or whatever you want it to say), that she's not allowed to get up, unless it's an emergency. If Emma wakes up too early, I tell her that the sun is still sleeping, so she needs to go back to sleep, too. It works with her, although, she cries a bit. You could also set an alarm for her, and tell her that until she hears the beeping, she's not allowed to get out of bed for the day (again, unless it's an emergency). You can always try my "jar method". Put a glass jar in her room somewhere high, and tell her for every night that she stays in the bed until the beeping goes off, she gets two coins (get play money from the dollar store). When the jar is full, she gets to pick out a new toy (again...the dollar store!

). Make it so that it will take her at least a month to accomplish so that she can have time to get into the habit. If you don't want to do that jars, try doing stickers on a homemade chart.
You know, maybe this somehow has something to do with the new baby arriving...???