Remove TODO.  This is actually already done.
Remove TODO.  No need to do this anymore.