Update to latest deps, rem unused deps