Merge "Remove unused client"