SetupWizard: more cleanup from review