Removed obsolete @todo