diff --git a/Gemfile.saas.lock b/Gemfile.saas.lock
index 938a53698..f624f2f9d 100644
--- a/Gemfile.saas.lock
+++ b/Gemfile.saas.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/basecamp/fizzy-saas
-  revision: f80da3c2faf34b94d65a41a501f19e8dba379012
+  revision: 27d4d34091de8db53bb01ac604c56e1a83b3adc3
   specs:
     fizzy-saas (0.1.0)
       prometheus-client-mmap
diff --git a/config/environments/beta.rb b/config/environments/beta.rb
index 11025f141..d89e30cf1 100644
--- a/config/environments/beta.rb
+++ b/config/environments/beta.rb
@@ -1,8 +1 @@
 require_relative "production"
-
-Rails.application.configure do
-  config.action_mailer.smtp_settings[:domain] = "fizzy-beta.37signals.com"
-  config.action_mailer.smtp_settings[:address] = "smtp-outbound-staging"
-  config.action_mailer.default_url_options     = { host: "fizzy-beta.37signals.com", protocol: "https" }
-  config.action_controller.default_url_options = { host: "fizzy-beta.37signals.com", protocol: "https" }
-end
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 8b426d2c6..3e4109dd3 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -88,9 +88,4 @@ Rails.application.configure do
   # Set host to be used by links generated in mailer and notification view templates.
   config.action_controller.default_url_options = { host: config.hosts.first, port: 3006 }
   config.action_mailer.default_url_options     = { host: config.hosts.first, port: 3006 }
-
-  if Rails.root.join("tmp/solid-queue.txt").exist?
-    config.active_job.queue_adapter = :solid_queue
-    config.solid_queue.connects_to = { database: { writing: :queue, reading: :queue } }
-  end
 end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index f1d786279..bdb274efb 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -69,12 +69,6 @@ Rails.application.configure do
   # Set this to true and configure the email server for immediate delivery to raise delivery errors.
   # config.action_mailer.raise_delivery_errors = false
 
-  # Set host to be used by links generated in mailer and notification view templates.
-  config.action_controller.default_url_options = { host: "app.fizzy.do", protocol: "https" }
-  config.action_mailer.default_url_options     = { host: "app.fizzy.do", protocol: "https" }
-
-  config.action_mailer.smtp_settings = { domain: "app.fizzy.do", address: "smtp-outbound", port: 25, enable_starttls_auto: false }
-
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
   # the I18n.default_locale when a translation cannot be found).
   config.i18n.fallbacks = true
diff --git a/config/environments/staging.rb b/config/environments/staging.rb
index f23bc800b..d89e30cf1 100644
--- a/config/environments/staging.rb
+++ b/config/environments/staging.rb
@@ -1,8 +1 @@
 require_relative "production"
-
-Rails.application.configure do
-  config.action_mailer.smtp_settings[:domain] = "fizzy.37signals-staging.com"
-  config.action_mailer.smtp_settings[:address] = "smtp-outbound-staging"
-  config.action_mailer.default_url_options     = { host: "fizzy.37signals-staging.com", protocol: "https" }
-  config.action_controller.default_url_options = { host: "fizzy.37signals-staging.com", protocol: "https" }
-end