Removed obsolete todo