Remove some old TODOs
Merge remote-tracking branch 'origin/MilestoneTwo' into MilestoneTwo