#68 Removed obsolete TODOs