Removed a couple of hardcoded e-mail settings.