Removed already completed TODO