fix headers and remove CNAME