Upgrade certain dependencies, and remove unused ones