Remove unnecessary TODO.
Add some voucher table index fields.