Clean up dependencies

Check for unused / wrongly scoped dependencies.

Leaving this issue open until the 2.6.1 release in case we find more unused dependencies. Just resolve it before the release.