Removed WizardState for now