Remove TODO list.
Index on id column for perf.

[#MON-3140]