Remove crufty cruft
Merge branch 'remove-cruft' into plugins
Minor tweaks
Lots of work to do, but have made a start