[TASK] Cleanup extbase todo's