[TASK] Clean up UpgradeWizardsService API