Remove cname issues