am 1ffda9be: Merge "Remove unused hosts."

* commit '1ffda9be60c64337085bbc65b2a0658b7c1c79b9':
  Remove unused hosts.