am 0739ebcb: am f8a504fc: am 1a51a136: am 4ee9b23a: Merge "Delete dead code" into mnc-dev

* commit '0739ebcbcf7cca4c6f1bb05ed0eb762c1d3a9b93':
  Delete dead code