diff --git a/Gemfile b/Gemfile
index f6a5cbb1a5958127c59eecbd27ef9f64693d904c..369e2b15e4b8ee5ed25533e3d522f4927efe6b45 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,6 @@
 source 'http://rubygems.org'
 
 gem 'rails', '3.0.0.beta4'
-gem 'mongrel'
 gem 'thin'
 gem 'em-http-request', :require => "em-http", :git => "git://github.com/igrigorik/em-http-request.git"
 gem 'addressable', :require => "addressable/uri"
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 45d756166aec1c9cd7d6048be4a105fa30943c54..cf137a878fa0165b8f07eb7919ba7a7a24cbd9af 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -16,5 +16,5 @@ Diaspora::Application.configure do
 
   # Don't care if the mailer can't send
   config.action_mailer.raise_delivery_errors = false
-  config.threadsafe!
+  #config.threadsafe!
 end