am 6ade0417: Merge "Remove dead code."

* commit '6ade0417485d964f8a9462105e6507bfb7d19914':
  Remove dead code.