Remove some no-longer-relevant TODO items.