diff --git a/lib/Target/TargetData.cpp b/lib/Target/TargetData.cpp
index b5077e4c653..2c1c5e63551 100644
--- a/lib/Target/TargetData.cpp
+++ b/lib/Target/TargetData.cpp
@@ -368,29 +368,17 @@ public:
   }
 
   void InvalidateEntry(const StructType *Ty) {
-    LayoutInfoTy::iterator I = this->find(Ty);
-    if (I == this->end()) return;
+    LayoutInfoTy::iterator I = LayoutInfo.find(Ty);
+    if (I == LayoutInfo.end()) return;
 
     I->second->~StructLayout();
     free(I->second);
-    this->erase(I);
+    LayoutInfo.erase(I);
 
     if (Ty->isAbstract())
       Ty->removeAbstractTypeUser(this);
   }
 
-  LayoutInfoTy::iterator end() {
-    return LayoutInfo.end();
-  }
-
-  LayoutInfoTy::iterator find(const StructType *&Val) {
-    return LayoutInfo.find(Val);
-  }
-
-  bool erase(LayoutInfoTy::iterator I) {
-    return LayoutInfo.erase(I);
-  }
-
   StructLayout *&operator[](const StructType *STy) {
     return LayoutInfo[STy];
   }