Merge "Remove indirect deps"