Remove one of the TODO lists.

Just combine them to clean things up a bit.