diff --git a/config/environments/development.rb b/config/environments/development.rb
index 4ae4daa..2058a7e 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -6,8 +6,7 @@ Errbit::Application.configure do
   # since you don't have to restart the webserver when you make code changes.
   config.cache_classes = false
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
+  config.eager_load = false
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 0ac6957..9c7bf4f 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -5,6 +5,8 @@ Errbit::Application.configure do
   # Code is not reloaded between requests
   config.cache_classes = true
 
+  config.eager_load = true
+
   # Shows or hides all error details if something goes wrong inside Errbit
   config.consider_all_requests_local       = false
   # Caching is turned on
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 5a1af4d..6e1759f 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -7,8 +7,7 @@ Errbit::Application.configure do
   # and recreated between test runs.  Don't rely on the data there!
   config.cache_classes = true
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
+  config.eager_load = false
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
diff --git a/config/initializers/mongo.rb b/config/initializers/mongo.rb
index 1dfb74d..f18333b 100644
--- a/config/initializers/mongo.rb
+++ b/config/initializers/mongo.rb
@@ -39,6 +39,5 @@ elsif ENV['HEROKU'] || ENV['USE_ENV']
   end
 end
 
-Mongoid.allow_dynamic_fields = false
 Mongoid.use_activesupport_time_zone = true
 Mongoid.identity_map_enabled = true
--
libgit2 0.21.2