Removed completed @todo