Cosmetics: removed obsolete TODOs