CNAME and clean up of 