am 58106813: Remove some TODOs.

* commit '581068131c192a8c495fac00d3c61807580c7eca':
  Remove some TODOs.