am e0efd5f6: Merge "Remove dead code"

* commit 'e0efd5f6c19e8944e5dd65e8c537fcb32b1b9fd2':
  Remove dead code