Getting rid of unused templates
Adding new flow for validating email