am 298ce021: Merge "Delete dead code"

* commit '298ce02189ef73088bab2550db42116a0a7db75d':
  Delete dead code