Issue 7079: Remove unused dependencies