Switch to using templates for email notifications
Removed unused line, replaced email verification to use new template system