cleaning up wizard and removing validations from account model