Remove country manager

Remove CountryManager

Merge only after #867