Removed unused line, replaced email verification to use new template system