Remove several old TODO messages

Some of these TODOs no longer apply,
and some have already been done elsewhere.

Change-Id: I7641abc4896fd9793ecc56d50e1ac3f314946d19
Merge "Remove several old TODO messages"