Task/10899/country cleanup

See [#10899](https://trac.vikingco.com/ticket/10899)