Merge "Remove unused service tags and client"