diff --git a/db/schema.rb b/db/schema.rb
index 51e67a05b3..8b46632b86 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130201220401) do
+ActiveRecord::Schema.define(:version => 20130118031610) do
 
   create_table "cms_blocks", :force => true do |t|
     t.integer  "page_id",    :null => false
@@ -296,7 +296,6 @@ ActiveRecord::Schema.define(:version => 20130201220401) do
     t.string  "iso3"
     t.string  "name"
     t.integer "numcode"
-    t.boolean "states_required", :default => true
   end
 
   create_table "spree_creditcards", :force => true do |t|
@@ -352,7 +351,6 @@ ActiveRecord::Schema.define(:version => 20130201220401) do
     t.datetime "updated_at",                                       :null => false
     t.integer  "max_quantity"
     t.integer  "shipping_method_id"
-    t.string   "currency"
   end
 
   add_index "spree_line_items", ["order_id"], :name => "index_line_items_on_order_id"
@@ -423,8 +421,6 @@ ActiveRecord::Schema.define(:version => 20130201220401) do
     t.string   "email"
     t.text     "special_instructions"
     t.integer  "distributor_id"
-    t.string   "currency"
-    t.string   "last_ip_address"
   end
 
   add_index "spree_orders", ["number"], :name => "index_orders_on_number"
@@ -438,7 +434,6 @@ ActiveRecord::Schema.define(:version => 20130201220401) do
     t.datetime "created_at",                             :null => false
     t.datetime "updated_at",                             :null => false
     t.datetime "deleted_at"
-    t.string   "display_on"
   end
 
   create_table "spree_payments", :force => true do |t|
@@ -479,12 +474,6 @@ ActiveRecord::Schema.define(:version => 20130201220401) do
 
   add_index "spree_preferences", ["key"], :name => "index_spree_preferences_on_key", :unique => true
 
-  create_table "spree_prices", :force => true do |t|
-    t.integer "variant_id",                               :null => false
-    t.decimal "amount",     :precision => 8, :scale => 2
-    t.string  "currency"
-  end
-
   create_table "spree_product_groups", :force => true do |t|
     t.string "name"
     t.string "permalink"
@@ -527,7 +516,7 @@ ActiveRecord::Schema.define(:version => 20130201220401) do
   add_index "spree_product_scopes", ["product_group_id"], :name => "index_product_scopes_on_product_group_id"
 
   create_table "spree_products", :force => true do |t|
-    t.string   "name",                 :default => "",    :null => false
+    t.string   "name",                 :default => "", :null => false
     t.text     "description"
     t.datetime "available_on"
     t.datetime "deleted_at"
@@ -536,13 +525,12 @@ ActiveRecord::Schema.define(:version => 20130201220401) do
     t.string   "meta_keywords"
     t.integer  "tax_category_id"
     t.integer  "shipping_category_id"
-    t.datetime "created_at",                              :null => false
-    t.datetime "updated_at",                              :null => false
-    t.integer  "count_on_hand",        :default => 0
+    t.datetime "created_at",                           :null => false
+    t.datetime "updated_at",                           :null => false
+    t.integer  "count_on_hand",        :default => 0,  :null => false
     t.integer  "supplier_id"
     t.boolean  "group_buy"
     t.float    "group_buy_unit_size"
-    t.boolean  "on_demand",            :default => false
   end
 
   add_index "spree_products", ["available_on"], :name => "index_products_on_available_on"
@@ -710,21 +698,18 @@ ActiveRecord::Schema.define(:version => 20130201220401) do
   end
 
   create_table "spree_tax_rates", :force => true do |t|
-    t.decimal  "amount",             :precision => 8, :scale => 5
+    t.decimal  "amount",            :precision => 8, :scale => 5
     t.integer  "zone_id"
     t.integer  "tax_category_id"
-    t.datetime "created_at",                                                          :null => false
-    t.datetime "updated_at",                                                          :null => false
-    t.boolean  "included_in_price",                                :default => false
-    t.string   "name"
-    t.boolean  "show_rate_in_label",                               :default => true
+    t.datetime "created_at",                                                         :null => false
+    t.datetime "updated_at",                                                         :null => false
+    t.boolean  "included_in_price",                               :default => false
   end
 
   create_table "spree_taxonomies", :force => true do |t|
-    t.string   "name",                      :null => false
-    t.datetime "created_at",                :null => false
-    t.datetime "updated_at",                :null => false
-    t.integer  "position",   :default => 0
+    t.string   "name",       :null => false
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
   end
 
   create_table "spree_taxons", :force => true do |t|
@@ -790,9 +775,8 @@ ActiveRecord::Schema.define(:version => 20130201220401) do
     t.string   "unlock_token"
     t.datetime "locked_at"
     t.datetime "remember_created_at"
-    t.string   "spree_api_key",          :limit => 48
+    t.string   "api_key",                :limit => 48
     t.datetime "reset_password_sent_at"
-    t.string   "api_key",                :limit => 40
   end
 
   add_index "spree_users", ["email"], :name => "email_idx_unique", :unique => true
@@ -807,12 +791,10 @@ ActiveRecord::Schema.define(:version => 20130201220401) do
     t.datetime "deleted_at"
     t.boolean  "is_master",                                   :default => false
     t.integer  "product_id"
-    t.integer  "count_on_hand",                               :default => 0
+    t.integer  "count_on_hand",                               :default => 0,     :null => false
     t.decimal  "cost_price",    :precision => 8, :scale => 2
     t.integer  "position"
-    t.integer  "lock_version",                                :default => 0
-    t.boolean  "on_demand",                                   :default => false
-    t.string   "cost_currency"
+    t.decimal  "price",         :precision => 8, :scale => 2,                    :null => false
   end
 
   add_index "spree_variants", ["product_id"], :name => "index_variants_on_product_id"