am bbf627a6: Merge "Remove unused code."

* commit 'bbf627a68e47319b1fcacb1487ab1d1618c3a82d':
  Remove unused code.