diff --git a/Gemfile b/Gemfile
index 7c62324c5..530573c68 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,17 +3,15 @@ source 'http://rubygems.org'
 gem 'rails', '3.0.0.beta4'
 gem 'mongrel'
 gem 'thin'
-gem 'em-http-request'
-gem 'addressable'
+gem 'em-http-request', :require => "em-http"
+gem 'addressable', :require => "addressable/uri"
 gem "mongoid", :git => "git://github.com/durran/mongoid.git"
 gem "bson_ext", "1.0.1"
 gem "haml"
 gem "devise", :git => "git://github.com/plataformatec/devise.git"
 gem 'roxml', :git => "git://github.com/Empact/roxml.git"
 
-
-gem 'dm-core' #:(
-
+  
 group :test do
 	gem 'rspec', '>= 2.0.0.beta.12'
 	gem 'rspec-rails', ">= 2.0.0.beta.8"
diff --git a/lib/message_handler.rb b/lib/message_handler.rb
index de4368f09..7d75ce08c 100644
--- a/lib/message_handler.rb
+++ b/lib/message_handler.rb
@@ -1,6 +1,6 @@
-require 'addressable/uri'
-require 'eventmachine'
-require 'em-http'
+# require 'addressable/uri'
+# require 'eventmachine'
+# require 'em-http'
 
 class MessageHandler 
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 060511f9a..d1152955e 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -16,7 +16,7 @@ Rspec.configure do |config|
   #
   # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
   #this is a dumb hax TODO
-   config.mock_with :mocha
+  #config.mock_with :mocha
   # config.mock_with :flexmock
   # config.mock_with :rr
   config.mock_with :rspec
@@ -41,5 +41,5 @@ Rspec.configure do |config|
   # If you're not using ActiveRecord, or you'd prefer not to run each of your
   # examples within a transaction, comment the following line or assign false
   # instead of true.
-  config.use_transactional_fixtures = false
+  config.use_transactional_fixtures = true
 end