am bee7ce20: Merge "Delete dead code." into jb-dev

* commit 'bee7ce20a5dad8b04075b3ec6a2ff0dc5d2d0cea':
  Delete dead code.