Merge "Remove redundant links to clients"