Merge "Remove redundant dependencies"