removing cname
Merge branch 'without_cname'