Bulk Changes to MailService to allow WebsiteSettings
Fixes and Redundancies