Merges user-info into signup, cleans up states