Remove a few stale TODOs.