remove CNAME
some improvement