Merge country and drug data in Countries collection

gets rid of country helper