am 4fe73b54: am ac4d8b31: am 6ade0417: Merge "Remove dead code."

* commit '4fe73b54b4e44cee7ebed99fb171c1368298c5d9':
  Remove dead code.