Add back CNAME plus cleanup.