Removed completed @todo comments