Remove unused markup, add email to session and view