Dropping Naps

When do children stop needing to nap? My 2 year old (25 months) has been fighting naptime. He also wakes up at 5:30am regardless of when his bedtime is. He occasionally wakes up in the middle of the night as well.

I will add that he has never been a “good sleeper” since birth.