diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py
index acf558d6399..e64b4278521 100644
--- a/lib/spack/spack/package.py
+++ b/lib/spack/spack/package.py
@@ -779,14 +779,6 @@ def cleanup():
                          "Manually remove this directory to fix:",
                          self.prefix)
 
-            if not (keep_prefix and keep_stage):
-                self.do_clean()
-            else:
-                tty.warn("Keeping stage in place despite error.",
-                         "Spack will refuse to uninstall dependencies of this package." +
-                         "Manually remove this directory to fix:",
-                         self.stage.path)
-
 
         def real_work():
             try: