Removed completed TODO comment