am 3e2ce4c7: Merge "Clean up some dead code."

* commit '3e2ce4c71ee13a16f2c7bf58d3a990687e4e5531':
  Clean up some dead code.