diff --git a/tools/bugpoint/OptimizerDriver.cpp b/tools/bugpoint/OptimizerDriver.cpp
index 610c524c26c..7c6e7c0a793 100644
--- a/tools/bugpoint/OptimizerDriver.cpp
+++ b/tools/bugpoint/OptimizerDriver.cpp
@@ -65,9 +65,6 @@ void BugDriver::EmitProgressBytecode(const std::string &ID, bool NoFlyer) {
   std::cout << getPassesString(PassesToRun) << "\n";
 }
 
-/// FIXME: This should be parameterizable!!
-static TargetData TD("bugpoint target");
-
 static void RunChild(Module *Program,const std::vector<const PassInfo*> &Passes,
                      const std::string &OutFilename) {
   std::ofstream OutFile(OutFilename.c_str());
@@ -80,8 +77,6 @@ static void RunChild(Module *Program,const std::vector<const PassInfo*> &Passes,
   for (unsigned i = 0, e = Passes.size(); i != e; ++i) {
     if (Passes[i]->getNormalCtor())
       PM.add(Passes[i]->getNormalCtor()());
-    else if (Passes[i]->getDataCtor())
-      PM.add(Passes[i]->getDataCtor()(TD));    // Provide dummy target data...
     else
       std::cerr << "Cannot create pass yet: " << Passes[i]->getPassName()
                 << "\n";
diff --git a/tools/gccas/gccas.cpp b/tools/gccas/gccas.cpp
index eae0b28e52b..043b0d2a823 100644
--- a/tools/gccas/gccas.cpp
+++ b/tools/gccas/gccas.cpp
@@ -94,9 +94,6 @@ void AddConfiguredTransformationPasses(PassManager &PM) {
 int main(int argc, char **argv) {
   cl::ParseCommandLineOptions(argc, argv, " llvm .s -> .o assembler for GCC\n");
 
-  // FIXME: This should eventually be parameterized...
-  TargetData TD("gccas target");
-
   std::auto_ptr<Module> M;
   try {
     // Parse the file now...
diff --git a/tools/llc/llc.cpp b/tools/llc/llc.cpp
index 15a272bbe28..fe1b89ff2d3 100644
--- a/tools/llc/llc.cpp
+++ b/tools/llc/llc.cpp
@@ -200,8 +200,6 @@ main(int argc, char **argv)
         { // handle other passes as normal optimization passes
           if (Opt->getNormalCtor())
             Passes.add(Opt->getNormalCtor()());
-          else if (Opt->getDataCtor())
-            Passes.add(Opt->getDataCtor()(Target.getTargetData()));
           else if (Opt->getTargetCtor())
             Passes.add(Opt->getTargetCtor()(Target));
           else
diff --git a/tools/opt/opt.cpp b/tools/opt/opt.cpp
index f59a80182e5..d03a65040bb 100644
--- a/tools/opt/opt.cpp
+++ b/tools/opt/opt.cpp
@@ -68,9 +68,6 @@ int main(int argc, char **argv) {
   cl::ParseCommandLineOptions(argc, argv,
 			      " llvm .bc -> .bc modular optimizer\n");
 
-  // FIXME: The choice of target should be controllable on the command line.
-  TargetData TD("opt target");
-
   // Allocate a full target machine description only if necessary...
   // FIXME: The choice of target should be controllable on the command line.
   std::auto_ptr<TargetMachine> target;
@@ -122,8 +119,6 @@ int main(int argc, char **argv) {
     
     if (Opt->getNormalCtor())
       Passes.add(Opt->getNormalCtor()());
-    else if (Opt->getDataCtor())
-      Passes.add(Opt->getDataCtor()(TD));    // Provide dummy target data...
     else if (Opt->getTargetCtor()) {
 #if 0
       if (target.get() == NULL)