Tidy up. Kill some dead code.

llvm-svn: 152131
2 files changed