Fix left over todos

Problem/Motivation

Follow-up on 📌 Review & resolve @todo's Fixed for the final things.

https://git.drupalcode.org/search?search=%40todo&nav_source=navbar&proje...

Steps to reproduce

Proposed resolution

Remaining tasks

User interface changes

API changes

Data model changes