Merge "Remove IpClient wrapper"