Reduce steps in onboarding sequence

Reduce steps in onboarding sequence