Removed completed TODO