SetupWizardActivity: code cleanup