Clean up and add some new remotes