diff --git a/config/environments/development.rb b/config/environments/development.rb
index c632b4d..3e46de3 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -6,9 +6,6 @@ Railsgoat::Application.configure do
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
-
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
@@ -22,13 +19,6 @@ Railsgoat::Application.configure do
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
 
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
-
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  config.active_record.auto_explain_threshold_in_seconds = 0.5
-
   # Tired of caching causing issues
   config.middleware.delete Rack::ETag
 
@@ -51,4 +41,10 @@ Railsgoat::Application.configure do
  #      :host => 'railsgoat.dev',
  #      :ignore => [ %r{dont/modify\.html$} ]
  # )
+
+  # For Rails 4.0+
+  # Do not eager load code on boot. This avoids loading your whole application
+  # just for the purpose of running a single test. If you are using a tool that
+  # preloads Rails for running tests, you may have to set it to true.
+  config.eager_load = false
 end
diff --git a/config/environments/mysql.rb b/config/environments/mysql.rb
index 0029db1..47d2452 100755
--- a/config/environments/mysql.rb
+++ b/config/environments/mysql.rb
@@ -6,9 +6,6 @@ Railsgoat::Application.configure do
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
-
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
@@ -22,10 +19,6 @@ Railsgoat::Application.configure do
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
 
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  config.active_record.auto_explain_threshold_in_seconds = 0.5
-  
   # Tired of caching causing issues
   config.middleware.delete Rack::ETag
 
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 69cf20b..4300360 100755
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -74,10 +74,6 @@ Railsgoat::Application.configure do
   # Send deprecation notices to registered listeners.
   config.active_support.deprecation = :notify
 
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  # config.active_record.auto_explain_threshold_in_seconds = 0.5
-
   # For Rails 4.0+: Eager load code on boot. This eager loads most of
   # Rails and your application in memory, allowing both thread web
   # servers and those relying on copy on write to perform better.