am f65e991: Remove unused code.

Merge commit 'f65e99108a2a0197434814f4df6df2e2bb258e18'

* commit 'f65e99108a2a0197434814f4df6df2e2bb258e18':
  Remove unused code.