Delete a bunch of cruft
Merge branch 'cruft'