Delete old TODOs related to v2 switchover

Delete some old TODO comments that are obsolete now that the default
cartridge model has been changed to v2.