Dependency upgrade and cleanup