Remove wizard and change related to new flow.

Remove wizard and change related to new flow.