CHG: delete todo comment