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

* commit '2b2916d15458671babed9e250b4d98f1980a976d':
  Remove some dead data.