Removed obsolete TODOs
Upcoming events ordering