Merge "[Ongoing Call] Remove TODOs that are no longer relevant." into sc-v2-dev