diff --git a/Library/Homebrew/cleaner.rb b/Library/Homebrew/cleaner.rb
index 8d89b7698d..f58f7c8c17 100644
--- a/Library/Homebrew/cleaner.rb
+++ b/Library/Homebrew/cleaner.rb
@@ -6,9 +6,9 @@
 # * sets permissions on executables
 class Cleaner
 
-  # Create a cleaner for the given formula name, and clean the keg
+  # Create a cleaner for the given formula and clean its keg
   def initialize f
-    @f = Formula.factory f
+    @f = f
     [f.bin, f.sbin, f.lib].select{ |d| d.exist? }.each{ |d| clean_dir d }
 
     if ENV['HOMEBREW_KEEP_INFO']
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index 9d6fa08488..2aec26befe 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -6,6 +6,7 @@ require 'keg'
 require 'tab'
 require 'bottles'
 require 'caveats'
+require 'cleaner'
 
 class FormulaInstaller
   attr_reader :f
@@ -409,7 +410,6 @@ class FormulaInstaller
       puts "in the formula."
       return
     end
-    require 'cleaner'
     Cleaner.new f
   rescue Exception => e
     opoo "The cleaning step did not complete successfully"