Remove obsolete TODOs
Refactor to get rid of unnecessary map in timer-list.