default.xml: remove warning comments and add proper specific remotes to their respective lines