Excise a lot of cruft