Remove old TODO comment block