am f8886e62: Merge "Remove dead code"

* commit 'f8886e62dbfc32b4c8bda942ea1029c09bf23f77':
  Remove dead code