basic cleanup of email template
merged our cleanup work