Comment changes only.

The TODOs are redundant now. I opened issues for them.