[#269][s]: get rid of final country stuff in lib model - fixes #269.