Removed outdated TODOs
Minor code changes. No functional change intended
Synced to 87943cac56ce7f6f3bc348986943f53f06953bc8
Synced to 87943cac56ce7f6f3bc348986943f53f06953bc8