diff --git a/config/environment.rb b/config/environment.rb
index 9afe20c52..8270f544d 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -7,18 +7,6 @@ require File.expand_path('../application', __FILE__)
 Haml::Template.options[:format] = :html5
 Haml::Template.options[:escape_html] = true
 
-if File.exists?(File.expand_path("./config/fb_config.yml"))
-  # Load facebook connection application credentials
-  fb_config  = YAML::load(File.open(File.expand_path("./config/fb_config.yml")))
-  FB_API_KEY = fb_config['fb_api_key']
-  FB_SECRET  = fb_config['fb_secret']
-  FB_APP_ID  = fb_config['fb_app_id']
-  HOST       = fb_config['host']
-  FACEBOOK   = true
-else
-  FACEBOOK   = false
-end
-
 if File.exists?(File.expand_path("./config/languages.yml"))
   languages = YAML::load(File.open(File.expand_path("./config/languages.yml")))
   AVAILABLE_LANGUAGES = (languages['available'].length > 0) ? languages['available'] : { :en => 'English' }
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 8c65da341..958f30b6f 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -35,7 +35,7 @@ Diaspora::Application.configure do
 
   # Disable Rails's static asset server
   # In production, Apache or nginx will already do this
-  #config.serve_static_assets = true
+  config.serve_static_assets = false
 
   # Enable serving of images, stylesheets, and javascripts from an asset server
   # config.action_controller.asset_host = "http://assets.example.com"