diff --git a/tools/analyze/AnalysisWrappers.cpp b/tools/analyze/AnalysisWrappers.cpp
index 89945f76ed3..aa9f03d8838 100644
--- a/tools/analyze/AnalysisWrappers.cpp
+++ b/tools/analyze/AnalysisWrappers.cpp
@@ -17,14 +17,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/iPHINode.h"
-#include "llvm/Type.h"
-#include "llvm/Assembly/Writer.h"
+#include "llvm/Pass.h"
 #include "llvm/Analysis/InstForest.h"
-#include "llvm/Analysis/Expressions.h"
-#include "llvm/Analysis/InductionVariable.h"
-#include "llvm/Analysis/LoopInfo.h"
-#include "llvm/Support/InstIterator.h"
 
 using namespace llvm;
 
@@ -43,68 +37,4 @@ namespace {
   };
 
   RegisterAnalysis<InstForestHelper> P1("instforest", "InstForest Printer");
-
-  struct IndVars : public FunctionPass {
-    Function *F;
-    LoopInfo *LI;
-    virtual bool runOnFunction(Function &Func) {
-      F = &Func; LI = &getAnalysis<LoopInfo>();
-      return false;
-    }
-
-    void print(std::ostream &OS) const {
-      for (inst_iterator I = inst_begin(*F), E = inst_end(*F); I != E; ++I)
-        if (PHINode *PN = dyn_cast<PHINode>(*I)) {
-          InductionVariable IV(PN, LI);
-          if (IV.InductionType != InductionVariable::Unknown)
-            IV.print(OS);
-        }
-    }
-    
-    void getAnalysisUsage(AnalysisUsage &AU) const {
-      AU.addRequired<LoopInfo>();
-      AU.setPreservesAll();
-    }
-  };
-
-  RegisterAnalysis<IndVars> P6("indvars", "Induction Variable Analysis");
-
-
-  struct Exprs : public FunctionPass {
-    Function *F;
-    virtual bool runOnFunction(Function &Func) { F = &Func; return false; }
-
-    void print(std::ostream &OS) const {
-      OS << "Classified expressions for: " << F->getName() << "\n";
-      for (inst_iterator I = inst_begin(*F), E = inst_end(*F); I != E; ++I) {
-        OS << *I;
-      
-        if ((*I)->getType() == Type::VoidTy) continue;
-        ExprType R = ClassifyExpr(*I);
-        if (R.Var == *I) continue;  // Doesn't tell us anything
-      
-        OS << "\t\tExpr =";
-        switch (R.ExprTy) {
-        case ExprType::ScaledLinear:
-          WriteAsOperand(OS << "(", (Value*)R.Scale) << " ) *";
-          // fall through
-        case ExprType::Linear:
-          WriteAsOperand(OS << "(", R.Var) << " )";
-          if (R.Offset == 0) break;
-          else OS << " +";
-          // fall through
-        case ExprType::Constant:
-          if (R.Offset) WriteAsOperand(OS, (Value*)R.Offset);
-          else OS << " 0";
-          break;
-        }
-        OS << "\n\n";
-      }
-    }
-    virtual void getAnalysisUsage(AnalysisUsage &AU) const {
-      AU.setPreservesAll();
-    }
-  };
-
-  RegisterAnalysis<Exprs> P7("exprs", "Expression Printer");
 }
diff --git a/tools/opt/AnalysisWrappers.cpp b/tools/opt/AnalysisWrappers.cpp
index 89945f76ed3..aa9f03d8838 100644
--- a/tools/opt/AnalysisWrappers.cpp
+++ b/tools/opt/AnalysisWrappers.cpp
@@ -17,14 +17,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/iPHINode.h"
-#include "llvm/Type.h"
-#include "llvm/Assembly/Writer.h"
+#include "llvm/Pass.h"
 #include "llvm/Analysis/InstForest.h"
-#include "llvm/Analysis/Expressions.h"
-#include "llvm/Analysis/InductionVariable.h"
-#include "llvm/Analysis/LoopInfo.h"
-#include "llvm/Support/InstIterator.h"
 
 using namespace llvm;
 
@@ -43,68 +37,4 @@ namespace {
   };
 
   RegisterAnalysis<InstForestHelper> P1("instforest", "InstForest Printer");
-
-  struct IndVars : public FunctionPass {
-    Function *F;
-    LoopInfo *LI;
-    virtual bool runOnFunction(Function &Func) {
-      F = &Func; LI = &getAnalysis<LoopInfo>();
-      return false;
-    }
-
-    void print(std::ostream &OS) const {
-      for (inst_iterator I = inst_begin(*F), E = inst_end(*F); I != E; ++I)
-        if (PHINode *PN = dyn_cast<PHINode>(*I)) {
-          InductionVariable IV(PN, LI);
-          if (IV.InductionType != InductionVariable::Unknown)
-            IV.print(OS);
-        }
-    }
-    
-    void getAnalysisUsage(AnalysisUsage &AU) const {
-      AU.addRequired<LoopInfo>();
-      AU.setPreservesAll();
-    }
-  };
-
-  RegisterAnalysis<IndVars> P6("indvars", "Induction Variable Analysis");
-
-
-  struct Exprs : public FunctionPass {
-    Function *F;
-    virtual bool runOnFunction(Function &Func) { F = &Func; return false; }
-
-    void print(std::ostream &OS) const {
-      OS << "Classified expressions for: " << F->getName() << "\n";
-      for (inst_iterator I = inst_begin(*F), E = inst_end(*F); I != E; ++I) {
-        OS << *I;
-      
-        if ((*I)->getType() == Type::VoidTy) continue;
-        ExprType R = ClassifyExpr(*I);
-        if (R.Var == *I) continue;  // Doesn't tell us anything
-      
-        OS << "\t\tExpr =";
-        switch (R.ExprTy) {
-        case ExprType::ScaledLinear:
-          WriteAsOperand(OS << "(", (Value*)R.Scale) << " ) *";
-          // fall through
-        case ExprType::Linear:
-          WriteAsOperand(OS << "(", R.Var) << " )";
-          if (R.Offset == 0) break;
-          else OS << " +";
-          // fall through
-        case ExprType::Constant:
-          if (R.Offset) WriteAsOperand(OS, (Value*)R.Offset);
-          else OS << " 0";
-          break;
-        }
-        OS << "\n\n";
-      }
-    }
-    virtual void getAnalysisUsage(AnalysisUsage &AU) const {
-      AU.setPreservesAll();
-    }
-  };
-
-  RegisterAnalysis<Exprs> P7("exprs", "Expression Printer");
 }