diff --git a/db/migrate/20150817000001_create_user_devices.rb b/db/migrate/20150817000001_create_user_devices.rb
index 013fb1d08..534a7c2c3 100644
--- a/db/migrate/20150817000001_create_user_devices.rb
+++ b/db/migrate/20150817000001_create_user_devices.rb
@@ -6,14 +6,19 @@ class CreateUserDevices < ActiveRecord::Migration
       t.string  :name,                 limit: 250, null: false
       t.string  :os,                   limit: 150, null: true
       t.string  :browser,              limit: 250, null: true
-      t.string  :country,              limit: 150, null: true
+      t.string  :location,             limit: 150, null: true
       t.string  :device_details,       limit: 2500, null: true
       t.string  :location_details,     limit: 2500, null: true
+      t.string  :fingerprint,          limit: 160, null: true
+      t.string  :user_agent,           limit: 250, null: true
+      t.string  :ip,                   limit: 160, null: true
       t.timestamps
     end
     add_index :user_devices, [:user_id]
-    add_index :user_devices, [:os, :browser, :country]
+    add_index :user_devices, [:os, :browser, :location]
+    add_index :user_devices, [:fingerprint]
     add_index :user_devices, [:updated_at]
+    add_index :user_devices, [:created_at]
   end
 
   def down
diff --git a/db/migrate/20150817000002_update_user_devices.rb b/db/migrate/20150817000002_update_user_devices.rb
deleted file mode 100644
index 05eda7d22..000000000
--- a/db/migrate/20150817000002_update_user_devices.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class UpdateUserDevices < ActiveRecord::Migration
-  def up
-    add_column :user_devices, :location, :string, limit: 150, null: true
-    remove_column :user_devices, :country
-    add_index :user_devices, [:os, :browser, :location]
-    UserDevice.reset_column_information
-  end
-
-end
diff --git a/db/migrate/20150818000001_update_user_devices2.rb b/db/migrate/20150818000001_update_user_devices2.rb
deleted file mode 100644
index f8a016424..000000000
--- a/db/migrate/20150818000001_update_user_devices2.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class UpdateUserDevices2 < ActiveRecord::Migration
-  def up
-    add_column :user_devices, :user_agent, :string, limit: 250, null: true
-    add_column :user_devices, :ip, :string, limit: 160, null: true
-    add_column :user_devices, :fingerprint, :string, limit: 160, null: true
-    add_index :user_devices, [:fingerprint]
-    add_index :user_devices, [:created_at]
-    UserDevice.reset_column_information
-  end
-
-end