Remove some TODO items that are done.