Removed obsolete TODO