removed obsolete TODOs