fix how we get country and locale information
removed unused classes
updated sample application