diff --git a/ChangeLog b/ChangeLog
index 5eec3c1bd3..f55f8cc0f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Wed Jan 19 12:08:08 2011  Eric Hodel <drbrain@segment7.net>
+
+	* lib/rubygems/commands/dependency_command.rb: Remove require of
+	  deleted file.
+	* lib/rubygems/commands/fetch_command.rb: ditto
+	* lib/rubygems/commands/setup_command.rb: ditto
+	* lib/rubygems/commands/sources_command.rb: ditto
+	* lib/rubygems/commands/specification_command.rb: ditto
+
 Wed Jan 19 08:13:59 2011  Ryan Davis  <ryand-ruby@zenspider.com>
 
 	* lib/rubygems*: Import rubygems 1.5.0 (release candidate)
diff --git a/lib/rubygems/commands/dependency_command.rb b/lib/rubygems/commands/dependency_command.rb
index 98d6b42893..b6840c35d4 100644
--- a/lib/rubygems/commands/dependency_command.rb
+++ b/lib/rubygems/commands/dependency_command.rb
@@ -7,7 +7,6 @@
 require 'rubygems/command'
 require 'rubygems/local_remote_options'
 require 'rubygems/version_option'
-require 'rubygems/source_info_cache'
 
 class Gem::Commands::DependencyCommand < Gem::Command
 
diff --git a/lib/rubygems/commands/fetch_command.rb b/lib/rubygems/commands/fetch_command.rb
index a95f1e4fb6..c0fdc83e46 100644
--- a/lib/rubygems/commands/fetch_command.rb
+++ b/lib/rubygems/commands/fetch_command.rb
@@ -7,7 +7,6 @@
 require 'rubygems/command'
 require 'rubygems/local_remote_options'
 require 'rubygems/version_option'
-require 'rubygems/source_info_cache'
 
 class Gem::Commands::FetchCommand < Gem::Command
 
diff --git a/lib/rubygems/commands/setup_command.rb b/lib/rubygems/commands/setup_command.rb
index 288be22f31..b7fb62cf53 100644
--- a/lib/rubygems/commands/setup_command.rb
+++ b/lib/rubygems/commands/setup_command.rb
@@ -118,8 +118,6 @@ By default, this RubyGems will install gem as:
 
     remove_old_bin_files bin_dir
 
-    remove_source_caches install_destdir
-
     say "RubyGems #{Gem::VERSION} installed"
 
     uninstall_old_gemcutter
@@ -335,21 +333,6 @@ abort "#{deprecation_message}"
     end
   end
 
-  def remove_source_caches(install_destdir)
-    if install_destdir.empty?
-      require 'rubygems/source_info_cache'
-
-      user_cache_file = File.join(install_destdir,
-                                  Gem::SourceInfoCache.user_cache_file)
-      system_cache_file = File.join(install_destdir,
-                                    Gem::SourceInfoCache.system_cache_file)
-
-      say "Removing old source_cache files" if Gem.configuration.really_verbose
-      rm_f user_cache_file if File.writable? File.dirname(user_cache_file)
-      rm_f system_cache_file if File.writable? File.dirname(system_cache_file)
-    end
-  end
-
   def run_rdoc(*args)
     begin
       gem 'rdoc'
diff --git a/lib/rubygems/commands/sources_command.rb b/lib/rubygems/commands/sources_command.rb
index 571e664272..7e04379bf4 100644
--- a/lib/rubygems/commands/sources_command.rb
+++ b/lib/rubygems/commands/sources_command.rb
@@ -6,7 +6,6 @@
 
 require 'rubygems/command'
 require 'rubygems/remote_fetcher'
-require 'rubygems/source_info_cache'
 require 'rubygems/spec_fetcher'
 require 'rubygems/local_remote_options'
 
diff --git a/lib/rubygems/commands/specification_command.rb b/lib/rubygems/commands/specification_command.rb
index dd2f6bd4da..987e401042 100644
--- a/lib/rubygems/commands/specification_command.rb
+++ b/lib/rubygems/commands/specification_command.rb
@@ -7,7 +7,6 @@
 require 'rubygems/command'
 require 'rubygems/local_remote_options'
 require 'rubygems/version_option'
-require 'rubygems/source_info_cache'
 require 'rubygems/format'
 
 class Gem::Commands::SpecificationCommand < Gem::Command