This is done. Remove the TODO.