Upgrade

I made small changes (mainly package upgrades and and unused file removals) based on your PR.

If you're okay with that, please merge this PR so it will be part of yours in upstream.