1 files changed, 9 insertions, 23 deletions
diff --git a/lib/address.js b/lib/address.js
index 741e36c4..e367aa28 100644
--- a/lib/address.js
+++ b/lib/address.js
@@ -1,6 +1,5 @@
 var Helpers = require('./helpers');
 var faker = require('../index');
-var definitions = require('../lib/definitions');
 
 var address = {
     zipCode: function () {
@@ -31,11 +30,11 @@ var address = {
     },
 
     cityPrefix: function () {
-      return faker.random.array_element(definitions.city_prefix);
+      return faker.random.array_element(faker.definitions.address.city_prefix);
     },
 
     citySuffix: function () {
-      return faker.random.array_element(definitions.city_suffix);
+      return faker.random.array_element(faker.definitions.address.city_suffix);
     },
 
     streetName: function () {
@@ -72,7 +71,7 @@ var address = {
     },
 
     streetSuffix: function () {
-        return faker.random.array_element(definitions.street_suffix);
+        return faker.random.array_element(faker.definitions.address.street_suffix);
     },
 
     secondaryAddress: function () {
@@ -84,31 +83,18 @@ var address = {
         ));
     },
 
-    brState: function (useAbbr) {
-        return useAbbr ? faker.address.brStateAbbr() : faker.random.array_element(definitions.br_state);
+    county: function () {
+      return faker.random.array_element(faker.definitions.address.county);
     },
 
-    brStateAbbr: function () {
-        return faker.random.array_element(definitions.br_state_abbr);
+    country: function () {
+      return faker.random.array_element(faker.definitions.address.country);
     },
 
-    ukCounty: function () {
-      return faker.random.array_element(definitions.uk_county);
+    state: function (useAbbr) {
+        return faker.random.array_element(faker.definitions.address.state);
     },
 
-    ukCountry: function () {
-      return faker.random.array_element(definitions.uk_country);
-    },
-
-    usState: function (useAbbr) {
-        return useAbbr ? faker.address.usStateAbbr() : faker.random.array_element(definitions.us_state);
-    },
-
-    usStateAbbr: function () {
-        return faker.random.array_element(definitions.us_state_abbr);
-    },
-
-
     latitude: function () {
         return (faker.random.number(180 * 10000) / 10000.0 - 90.0).toFixed(4);
     },