refactor: simplify control-plane persistence wiring (#2559)