removed group-type, city and country from taverngroup model