Removed dead and duplicate code in onboarding