Simplified code by removing international support.