Would it be safe to remove the old TODO now?