am 6088047a: Merge "Remove dead files."

* commit '6088047a64abb1e8a27fcb9868b00a630fbdfed4':
  Remove dead files.