Revert "Add flavor in wizard"

This reverts commit 8ba0dd710a57d6c2b47475ae2f710c3485b52d5b.

Change-Id: Ibfd289b3374a30db42476c510c4ad716f7ab96c7