Removed completed TODO statements