diff --git a/config/environments/development.rb b/config/environments/development.rb
index 179798a6b..7d656b632 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -52,21 +52,4 @@ Discourse::Application.configure do
     config.developer_emails = emails.split(",").map(&:downcase).map(&:strip)
   end
 
-
-  if GlobalSetting.smtp_address
-    settings = {
-      address:              GlobalSetting.smtp_address,
-      port:                 GlobalSetting.smtp_port,
-      domain:               GlobalSetting.smtp_domain,
-      user_name:            GlobalSetting.smtp_user_name,
-      password:             GlobalSetting.smtp_password,
-      authentication:       GlobalSetting.smtp_authentication,
-      enable_starttls_auto: GlobalSetting.smtp_enable_start_tls
-    }
-
-    settings[:openssl_verify_mode] = GlobalSetting.smtp_openssl_verify_mode if GlobalSetting.smtp_openssl_verify_mode
-
-    config.action_mailer.smtp_settings = settings.reject{|_, y| y.nil?}
-  end
-
 end