- remove unused variable to pass pylint
- Use another approach to detect if known-good remote is already
  present to avoid the need for "ignore following errors" message.