Cleaned up wizard code.