#141 Removed obsolete TODOs