am 4568e344: am 2b2916d1: Merge "Remove some dead data."

* commit '4568e344c0a7581dc1b32387ba18c99df76ffeea':
  Remove some dead data.