Removed obsolete @todo comments