Change CNAME and remove extra