ControllerConfigDiag: Remove now obsolete TODOs