Cleanup of unused remotes.

Change-Id: I0c71a3c29fe1298acbf7e1890d8f8ff070715ea9
Merge upstream