Upgrade

I made small changes (mainly package upgrades and and unused file removals) based on your PR.
I consider useless _at least for now_ the thing I removed but I might be over-opinionated.

If you're okay with that, please merge this PR so it will be part of yours in upstream.