Remove CNAME until circular ref fixed