Removed obsolete TODOs