I would have split the removal and the renaming into 2 patches, but that's not a big deal. I don't think I have the authority to approve that, but it LGTM. Let's add some reviewers with more knowledge of the history of that code, they might have something to say. http://reviews.llvm.org/D5504