rpearce/grichards: Adding remove_cnames support