[TASK] Cleanup UpgradeWizard API