diff --git a/include/llvm/CodeGen/LiveIntervalAnalysis.h b/include/llvm/CodeGen/LiveIntervalAnalysis.h
index 2bcef48e966..77451846c29 100644
--- a/include/llvm/CodeGen/LiveIntervalAnalysis.h
+++ b/include/llvm/CodeGen/LiveIntervalAnalysis.h
@@ -38,10 +38,6 @@ namespace llvm {
     const TargetInstrInfo* tii_;
     LiveVariables* lv_;
 
-    /// MBB2IdxMap - The index of the first instruction in the specified basic
-    /// block.
-    std::vector<unsigned> MBB2IdxMap;
-    
     typedef std::map<MachineInstr*, unsigned> Mi2IndexMap;
     Mi2IndexMap mi2iMap_;
 
@@ -117,17 +113,6 @@ namespace llvm {
       return I->second;
     }
 
-    /// getMBBStartIdx - Return the base index of the first instruction in the
-    /// specified MachineBasicBlock.
-    unsigned getMBBStartIdx(MachineBasicBlock *MBB) const {
-      return getMBBStartIdx(MBB->getNumber());
-    }
-    
-    unsigned getMBBStartIdx(unsigned MBBNo) const {
-      assert(MBBNo < MBB2IdxMap.size() && "Invalid MBB number!");
-      return MBB2IdxMap[MBBNo];
-    }
-
     /// getInstructionIndex - returns the base index of instr
     unsigned getInstructionIndex(MachineInstr* instr) const {
       Mi2IndexMap::const_iterator it = mi2iMap_.find(instr);
@@ -143,7 +128,7 @@ namespace llvm {
              "index does not correspond to an instruction");
       return i2miMap_[index];
     }
-    
+
     std::vector<LiveInterval*> addIntervalsForSpills(const LiveInterval& i,
                                                      VirtRegMap& vrm,
                                                      int slot);
@@ -170,17 +155,12 @@ namespace llvm {
       }
     }
       
-    /// computeIntervals - Compute live intervals.  This returns a vector of all
-    /// the two-address instructions to the caller.
-    void computeIntervals(std::vector<MachineInstr*> &TwoAddrInsts);
+    /// computeIntervals - compute live intervals
+    void computeIntervals();
 
     /// joinIntervals - join compatible live intervals
     void joinIntervals();
 
-    /// HandleTwoAddressInsts - Arrange for the specified list of 2-addr
-    /// instructions to have their src/dst regs allocated to the same register.
-    void HandleTwoAddressInsts(const std::vector<MachineInstr*> &TwoAddrInsts);
-
     /// CopyCoallesceInMBB - Coallsece copies in the specified MBB, putting
     /// copies that cannot yet be coallesced into the "TryAgain" list.
     void CopyCoallesceInMBB(MachineBasicBlock *MBB,