Update TODO: Remove some things that we've done.