diff --git a/bin/addons/base/base_data.xml b/bin/addons/base/base_data.xml
index e2d66b26763..b36e635a8c0 100644
--- a/bin/addons/base/base_data.xml
+++ b/bin/addons/base/base_data.xml
@@ -1002,6 +1002,258 @@
 		<field name="code">zw</field>
 	</record>
 
+	<!-- USA States -->
+	<record model="res.country.state" id="us-al">
+		<field name="name">Alabama</field>
+		<field name="code">al</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-ak">
+		<field name="name">Alaska</field>
+		<field name="code">ak</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-az">
+		<field name="name">Arizona</field>
+		<field name="code">az</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-ar">
+		<field name="name">Arkansas</field>
+		<field name="code">ar</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-ca">
+		<field name="name">California</field>
+		<field name="code">ca</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-co">
+		<field name="name">Colorado</field>
+		<field name="code">co</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-ct">
+		<field name="name">Connecticut</field>
+		<field name="code">ct</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-de">
+		<field name="name">Delaware</field>
+		<field name="code">de</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-fl">
+		<field name="name">Florida</field>
+		<field name="code">fl</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-ga">
+		<field name="name">Georgia</field>
+		<field name="code">ga</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-hi">
+		<field name="name">Hawaii</field>
+		<field name="code">hi</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-id">
+		<field name="name">Idaho</field>
+		<field name="code">id</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-il">
+		<field name="name">Illinois</field>
+		<field name="code">il</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-in">
+		<field name="name">Indiana</field>
+		<field name="code">in</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-ia">
+		<field name="name">Iowa</field>
+		<field name="code">ia</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-ks">
+		<field name="name">Kansas</field>
+		<field name="code">ks</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-ky">
+		<field name="name">Kentucky</field>
+		<field name="code">ky</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-la">
+		<field name="name">Louisiana</field>
+		<field name="code">la</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-me">
+		<field name="name">Maine</field>
+		<field name="code">me</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-md">
+		<field name="name">Maryland</field>
+		<field name="code">md</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-ma">
+		<field name="name">Massachusetts</field>
+		<field name="code">ma</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-mi">
+		<field name="name">Michigan</field>
+		<field name="code">mi</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-mn">
+		<field name="name">Minnesota</field>
+		<field name="code">mn</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-ms">
+		<field name="name">Mississippi</field>
+		<field name="code">ms</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-mo">
+		<field name="name">Missouri</field>
+		<field name="code">mo</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-mt">
+		<field name="name">Montana</field>
+		<field name="code">mt</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-ne">
+		<field name="name">Nebraska</field>
+		<field name="code">ne</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-nv">
+		<field name="name">Nevada</field>
+		<field name="code">nv</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-nh">
+		<field name="name">New Hampshire</field>
+		<field name="code">nh</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-nj">
+		<field name="name">New Jersey</field>
+		<field name="code">nj</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-nm">
+		<field name="name">New Mexico</field>
+		<field name="code">nm</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-ny">
+		<field name="name">New York</field>
+		<field name="code">ny</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-nc">
+		<field name="name">North Carolina</field>
+		<field name="code">nc</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-nd">
+		<field name="name">North Dakota</field>
+		<field name="code">nd</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-oh">
+		<field name="name">Ohio</field>
+		<field name="code">oh</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-ok">
+		<field name="name">Oklahoma</field>
+		<field name="code">ok</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-or">
+		<field name="name">Oregon</field>
+		<field name="code">or</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-pa">
+		<field name="name">Pennsylvania</field>
+		<field name="code">pa</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-ri">
+		<field name="name">Rhode Island</field>
+		<field name="code">ri</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-sc">
+		<field name="name">South Carolina</field>
+		<field name="code">sc</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-sd">
+		<field name="name">South Dakota</field>
+		<field name="code">sd</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-tn">
+		<field name="name">Tennessee</field>
+		<field name="code">tn</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-tx">
+		<field name="name">Texas</field>
+		<field name="code">tx</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-ut">
+		<field name="name">Utah</field>
+		<field name="code">ut</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-vt">
+		<field name="name">Vermont</field>
+		<field name="code">vt</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-va">
+		<field name="name">Virginia</field>
+		<field name="code">va</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-wa">
+		<field name="name">Washington</field>
+		<field name="code">wa</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-wv">
+		<field name="name">West Virginia</field>
+		<field name="code">wv</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-wi">
+		<field name="name">Wisconsin</field>
+		<field name="code">wi</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+	<record model="res.country.state" id="us-wy">
+		<field name="name">Wyoming</field>
+		<field name="code">wy</field>
+		<field name="country_id" model="res.country" ref="us"/>
+	</record>
+
 	<record model="res.partner" id="main_partner">
 		<field name="name">Tiny sprl</field>
 	</record>
@@ -1015,7 +1267,7 @@
 		<field name="type">default</field>
 		<field name="country_id" model="res.country" ref="be"/>
 	</record>
-	
+
 #
 # Currencies
 #
diff --git a/bin/addons/base/base_demo.xml b/bin/addons/base/base_demo.xml
index cfbd8ed3dcf..8ef0ae5f22c 100644
--- a/bin/addons/base/base_demo.xml
+++ b/bin/addons/base/base_demo.xml
@@ -22,257 +22,5 @@
 		<field name="currency_id" ref="USD"/>
 	</record>
 
-
-	<!-- USA States -->
-	<record model="res.country.state" id="us-al">
-		<field name="name">Alabama</field>
-		<field name="code">al</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-ak">
-		<field name="name">Alaska</field>
-		<field name="code">ak</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-az">
-		<field name="name">Arizona</field>
-		<field name="code">az</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-ar">
-		<field name="name">Arkansas</field>
-		<field name="code">ar</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-ca">
-		<field name="name">California</field>
-		<field name="code">ca</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-co">
-		<field name="name">Colorado</field>
-		<field name="code">co</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-ct">
-		<field name="name">Connecticut</field>
-		<field name="code">ct</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-de">
-		<field name="name">Delaware</field>
-		<field name="code">de</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-fl">
-		<field name="name">Florida</field>
-		<field name="code">fl</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-ga">
-		<field name="name">Georgia</field>
-		<field name="code">ga</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-hi">
-		<field name="name">Hawaii</field>
-		<field name="code">hi</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-id">
-		<field name="name">Idaho</field>
-		<field name="code">id</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-il">
-		<field name="name">Illinois</field>
-		<field name="code">il</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-in">
-		<field name="name">Indiana</field>
-		<field name="code">in</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-ia">
-		<field name="name">Iowa</field>
-		<field name="code">ia</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-ks">
-		<field name="name">Kansas</field>
-		<field name="code">ks</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-ky">
-		<field name="name">Kentucky</field>
-		<field name="code">ky</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-la">
-		<field name="name">Louisiana</field>
-		<field name="code">la</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-me">
-		<field name="name">Maine</field>
-		<field name="code">me</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-md">
-		<field name="name">Maryland</field>
-		<field name="code">md</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-ma">
-		<field name="name">Massachusetts</field>
-		<field name="code">ma</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-mi">
-		<field name="name">Michigan</field>
-		<field name="code">mi</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-mn">
-		<field name="name">Minnesota</field>
-		<field name="code">mn</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-ms">
-		<field name="name">Mississippi</field>
-		<field name="code">ms</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-mo">
-		<field name="name">Missouri</field>
-		<field name="code">mo</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-mt">
-		<field name="name">Montana</field>
-		<field name="code">mt</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-ne">
-		<field name="name">Nebraska</field>
-		<field name="code">ne</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-nv">
-		<field name="name">Nevada</field>
-		<field name="code">nv</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-nh">
-		<field name="name">New Hampshire</field>
-		<field name="code">nh</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-nj">
-		<field name="name">New Jersey</field>
-		<field name="code">nj</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-nm">
-		<field name="name">New Mexico</field>
-		<field name="code">nm</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-ny">
-		<field name="name">New York</field>
-		<field name="code">ny</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-nc">
-		<field name="name">North Carolina</field>
-		<field name="code">nc</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-nd">
-		<field name="name">North Dakota</field>
-		<field name="code">nd</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-oh">
-		<field name="name">Ohio</field>
-		<field name="code">oh</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-ok">
-		<field name="name">Oklahoma</field>
-		<field name="code">ok</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-or">
-		<field name="name">Oregon</field>
-		<field name="code">or</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-pa">
-		<field name="name">Pennsylvania</field>
-		<field name="code">pa</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-ri">
-		<field name="name">Rhode Island</field>
-		<field name="code">ri</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-sc">
-		<field name="name">South Carolina</field>
-		<field name="code">sc</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-sd">
-		<field name="name">South Dakota</field>
-		<field name="code">sd</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-tn">
-		<field name="name">Tennessee</field>
-		<field name="code">tn</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-tx">
-		<field name="name">Texas</field>
-		<field name="code">tx</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-ut">
-		<field name="name">Utah</field>
-		<field name="code">ut</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-vt">
-		<field name="name">Vermont</field>
-		<field name="code">vt</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-va">
-		<field name="name">Virginia</field>
-		<field name="code">va</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-wa">
-		<field name="name">Washington</field>
-		<field name="code">wa</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-wv">
-		<field name="name">West Virginia</field>
-		<field name="code">wv</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-wi">
-		<field name="name">Wisconsin</field>
-		<field name="code">wi</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
-	<record model="res.country.state" id="us-wy">
-		<field name="name">Wyoming</field>
-		<field name="code">wy</field>
-		<field name="country_id" model="res.country" ref="us"/>
-	</record>
 </data>
 </terp>