Remove bogus warning that we've now eliminated the need for
Corelists also gone
Add branch reset script
Enable branch reset trick
Tidy code