diff --git a/app/models/machines_pricing.rb b/app/models/machines_pricing.rb
deleted file mode 100644
index f52d5d245..000000000
--- a/app/models/machines_pricing.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-##DEPRECATED, this class is not used anymore from the migration to the Pricing model
-##TODO remove in future update, in conjunction with the following migrations:
-#   - 20140606133116_create_machines_pricings.rb
-#   - 20150520133409_migrate_data_from_machines_pricings_to_prices.rb
-#   - 20150603133050_drop_machines_pricings.rb
-class MachinesPricing < ActiveRecord::Base
-  belongs_to :machine
-  belongs_to :group
-end
diff --git a/db/migrate/20140606133116_create_machines_pricings.rb b/db/migrate/20140606133116_create_machines_pricings.rb
deleted file mode 100644
index 148705e10..000000000
--- a/db/migrate/20140606133116_create_machines_pricings.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class CreateMachinesPricings < ActiveRecord::Migration
-  def change
-    create_table :machines_pricings do |t|
-      t.belongs_to :machine, index: true
-      t.belongs_to :group, index: true
-      t.integer :not_subscribe_amount
-      t.integer :month_amount
-      t.integer :year_amount
-
-      t.timestamps
-    end
-  end
-end
diff --git a/db/migrate/20150520133409_migrate_data_from_machines_pricings_to_prices.rb b/db/migrate/20150520133409_migrate_data_from_machines_pricings_to_prices.rb
deleted file mode 100644
index d9c71c79c..000000000
--- a/db/migrate/20150520133409_migrate_data_from_machines_pricings_to_prices.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-class MigrateDataFromMachinesPricingsToPrices < ActiveRecord::Migration
-  def up
-    insert <<-SQL
-      DELETE FROM machines_pricings WHERE machine_id NOT IN ( select distinct machines.id from machines )
-    SQL
-
-    machines_pricings = select_all("SELECT * FROM machines_pricings")
-    machines_pricings.each do |m_pricing|
-      time = "'#{Time.now.to_s(:db)}'"
-
-      plan_year = select_one("SELECT id FROM plans where plans.group_id = #{m_pricing['group_id']} and plans.interval = 'year'")
-      insert <<-SQL
-        INSERT INTO prices (group_id, plan_id, priceable_id, priceable_type, amount, created_at, updated_at)
-        VALUES (#{m_pricing['group_id']}, #{plan_year['id']}, #{m_pricing['machine_id']}, 'Machine', #{m_pricing['year_amount']}, #{time}, #{time})
-      SQL
-
-      plan_month = select_one("SELECT id FROM plans where plans.group_id = #{m_pricing['group_id']} and plans.interval = 'month'")
-      insert <<-SQL
-        INSERT INTO prices (group_id, plan_id, priceable_id, priceable_type, amount, created_at, updated_at)
-        VALUES (#{m_pricing['group_id']}, #{plan_month['id']}, #{m_pricing['machine_id']}, 'Machine', #{m_pricing['month_amount']}, #{time}, #{time})
-      SQL
-
-      insert <<-SQL
-        INSERT INTO prices (group_id, plan_id, priceable_id, priceable_type, amount, created_at, updated_at)
-        VALUES (#{m_pricing['group_id']}, NULL, #{m_pricing['machine_id']}, 'Machine', #{m_pricing['not_subscribe_amount']}, #{time}, #{time})
-      SQL
-    end
-  end
-
-  def down
-    insert <<-SQL
-      DELETE FROM prices
-    SQL
-  end
-end
diff --git a/db/migrate/20150603133050_drop_machines_pricings.rb b/db/migrate/20150603133050_drop_machines_pricings.rb
deleted file mode 100644
index f1502b997..000000000
--- a/db/migrate/20150603133050_drop_machines_pricings.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class DropMachinesPricings < ActiveRecord::Migration
-  def up
-    drop_table :machines_pricings
-  end
-end
diff --git a/db/schema.rb b/db/schema.rb
index 162b94922..f346c4f84 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -30,23 +30,23 @@ ActiveRecord::Schema.define(version: 20160119131623) do
   add_index "abuses", ["signaled_type", "signaled_id"], name: "index_abuses_on_signaled_type_and_signaled_id", using: :btree
 
   create_table "addresses", force: :cascade do |t|
-    t.string   "address",        limit: 255
-    t.string   "street_number",  limit: 255
-    t.string   "route",          limit: 255
-    t.string   "locality",       limit: 255
-    t.string   "country",        limit: 255
-    t.string   "postal_code",    limit: 255
+    t.string   "address"
+    t.string   "street_number"
+    t.string   "route"
+    t.string   "locality"
+    t.string   "country"
+    t.string   "postal_code"
     t.integer  "placeable_id"
-    t.string   "placeable_type", limit: 255
+    t.string   "placeable_type"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   create_table "assets", force: :cascade do |t|
     t.integer  "viewable_id"
-    t.string   "viewable_type", limit: 255
-    t.string   "attachment",    limit: 255
-    t.string   "type",          limit: 255
+    t.string   "viewable_type"
+    t.string   "attachment"
+    t.string   "type"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -63,11 +63,11 @@ ActiveRecord::Schema.define(version: 20160119131623) do
   create_table "availabilities", force: :cascade do |t|
     t.datetime "start_at"
     t.datetime "end_at"
-    t.string   "available_type",  limit: 255
+    t.string   "available_type"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "nb_total_places"
-    t.boolean  "destroying",                  default: false
+    t.boolean  "destroying",      default: false
   end
 
   create_table "availability_tags", force: :cascade do |t|
@@ -81,18 +81,18 @@ ActiveRecord::Schema.define(version: 20160119131623) do
   add_index "availability_tags", ["tag_id"], name: "index_availability_tags_on_tag_id", using: :btree
 
   create_table "categories", force: :cascade do |t|
-    t.string   "name",       limit: 255
+    t.string   "name"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   create_table "components", force: :cascade do |t|
-    t.string "name", limit: 255, null: false
+    t.string "name", null: false
   end
 
   create_table "credits", force: :cascade do |t|
     t.integer  "creditable_id"
-    t.string   "creditable_type", limit: 255
+    t.string   "creditable_type"
     t.integer  "plan_id"
     t.integer  "hours"
     t.datetime "created_at"
@@ -113,7 +113,7 @@ ActiveRecord::Schema.define(version: 20160119131623) do
   end
 
   create_table "events", force: :cascade do |t|
-    t.string   "title",           limit: 255
+    t.string   "title"
     t.text     "description"
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -139,10 +139,10 @@ ActiveRecord::Schema.define(version: 20160119131623) do
   add_index "events_categories", ["event_id"], name: "index_events_categories_on_event_id", using: :btree
 
   create_table "friendly_id_slugs", force: :cascade do |t|
-    t.string   "slug",           limit: 255, null: false
-    t.integer  "sluggable_id",               null: false
+    t.string   "slug",                      null: false
+    t.integer  "sluggable_id",              null: false
     t.string   "sluggable_type", limit: 50
-    t.string   "scope",          limit: 255
+    t.string   "scope"
     t.datetime "created_at"
   end
 
@@ -152,17 +152,17 @@ ActiveRecord::Schema.define(version: 20160119131623) do
   add_index "friendly_id_slugs", ["sluggable_type"], name: "index_friendly_id_slugs_on_sluggable_type", using: :btree
 
   create_table "groups", force: :cascade do |t|
-    t.string   "name",       limit: 255
+    t.string   "name"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "slug",       limit: 255
+    t.string   "slug"
   end
 
   add_index "groups", ["slug"], name: "index_groups_on_slug", unique: true, using: :btree
 
   create_table "invoice_items", force: :cascade do |t|
     t.integer  "invoice_id"
-    t.string   "stp_invoice_item_id", limit: 255
+    t.string   "stp_invoice_item_id"
     t.integer  "amount"
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -175,17 +175,17 @@ ActiveRecord::Schema.define(version: 20160119131623) do
 
   create_table "invoices", force: :cascade do |t|
     t.integer  "invoiced_id"
-    t.string   "invoiced_type",          limit: 255
-    t.string   "stp_invoice_id",         limit: 255
+    t.string   "invoiced_type"
+    t.string   "stp_invoice_id"
     t.integer  "total"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "user_id"
-    t.string   "reference",              limit: 255
-    t.string   "avoir_mode",             limit: 255
+    t.string   "reference"
+    t.string   "avoir_mode"
     t.datetime "avoir_date"
     t.integer  "invoice_id"
-    t.string   "type",                   limit: 255
+    t.string   "type"
     t.boolean  "subscription_to_expire"
     t.text     "description"
   end
@@ -194,17 +194,17 @@ ActiveRecord::Schema.define(version: 20160119131623) do
   add_index "invoices", ["user_id"], name: "index_invoices_on_user_id", using: :btree
 
   create_table "licences", force: :cascade do |t|
-    t.string "name",        limit: 255, null: false
+    t.string "name",        null: false
     t.text   "description"
   end
 
   create_table "machines", force: :cascade do |t|
-    t.string   "name",        limit: 255, null: false
+    t.string   "name",        null: false
     t.text     "description"
     t.text     "spec"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "slug",        limit: 255
+    t.string   "slug"
   end
 
   add_index "machines", ["slug"], name: "index_machines_on_slug", unique: true, using: :btree
@@ -220,14 +220,14 @@ ActiveRecord::Schema.define(version: 20160119131623) do
   create_table "notifications", force: :cascade do |t|
     t.integer  "receiver_id"
     t.integer  "attached_object_id"
-    t.string   "attached_object_type", limit: 255
+    t.string   "attached_object_type"
     t.integer  "notification_type_id"
-    t.boolean  "is_read",                          default: false
+    t.boolean  "is_read",              default: false
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "receiver_type",        limit: 255
-    t.boolean  "is_send",                          default: false
-    t.jsonb    "meta_data",                        default: {}
+    t.string   "receiver_type"
+    t.boolean  "is_send",              default: false
+    t.jsonb    "meta_data",            default: {}
   end
 
   add_index "notifications", ["notification_type_id"], name: "index_notifications_on_notification_type_id", using: :btree
@@ -268,20 +268,20 @@ ActiveRecord::Schema.define(version: 20160119131623) do
   add_index "offer_days", ["subscription_id"], name: "index_offer_days_on_subscription_id", using: :btree
 
   create_table "plans", force: :cascade do |t|
-    t.string   "name",               limit: 255
+    t.string   "name"
     t.integer  "amount"
-    t.string   "interval",           limit: 255
+    t.string   "interval"
     t.integer  "group_id"
-    t.string   "stp_plan_id",        limit: 255
+    t.string   "stp_plan_id"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "training_credit_nb",             default: 0
-    t.boolean  "is_rolling",                     default: true
+    t.integer  "training_credit_nb", default: 0
+    t.boolean  "is_rolling",         default: true
     t.text     "description"
     t.string   "type"
     t.string   "base_name"
-    t.integer  "ui_weight",                      default: 0
-    t.integer  "interval_count",                 default: 1
+    t.integer  "ui_weight",          default: 0
+    t.integer  "interval_count",     default: 1
   end
 
   add_index "plans", ["group_id"], name: "index_plans_on_group_id", using: :btree
@@ -302,11 +302,11 @@ ActiveRecord::Schema.define(version: 20160119131623) do
 
   create_table "profiles", force: :cascade do |t|
     t.integer  "user_id"
-    t.string   "first_name",        limit: 255
-    t.string   "last_name",         limit: 255
+    t.string   "first_name"
+    t.string   "last_name"
     t.boolean  "gender"
     t.date     "birthday"
-    t.string   "phone",             limit: 255
+    t.string   "phone"
     t.text     "interest"
     t.text     "software_mastered"
     t.datetime "created_at"
@@ -320,7 +320,7 @@ ActiveRecord::Schema.define(version: 20160119131623) do
     t.integer  "project_id"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "title",       limit: 255
+    t.string   "title"
   end
 
   add_index "project_steps", ["project_id"], name: "index_project_steps_on_project_id", using: :btree
@@ -330,23 +330,23 @@ ActiveRecord::Schema.define(version: 20160119131623) do
     t.integer  "user_id"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.boolean  "is_valid",                default: false
-    t.string   "valid_token", limit: 255
+    t.boolean  "is_valid",    default: false
+    t.string   "valid_token"
   end
 
   add_index "project_users", ["project_id"], name: "index_project_users_on_project_id", using: :btree
   add_index "project_users", ["user_id"], name: "index_project_users_on_user_id", using: :btree
 
   create_table "projects", force: :cascade do |t|
-    t.string   "name",         limit: 255
+    t.string   "name"
     t.text     "description"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "author_id"
     t.text     "tags"
     t.integer  "licence_id"
-    t.string   "state",        limit: 255
-    t.string   "slug",         limit: 255
+    t.string   "state"
+    t.string   "slug"
     t.datetime "published_at"
   end
 
@@ -382,20 +382,20 @@ ActiveRecord::Schema.define(version: 20160119131623) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "reservable_id"
-    t.string   "reservable_type",           limit: 255
-    t.string   "stp_invoice_id",            limit: 255
+    t.string   "reservable_type"
+    t.string   "stp_invoice_id"
     t.integer  "nb_reserve_places"
     t.integer  "nb_reserve_reduced_places"
   end
 
-  add_index "reservations", ["reservable_id", "reservable_type"], name: "index_reservations_on_reservable_id_and_reservable_type", using: :btree
+  add_index "reservations", ["reservable_type", "reservable_id"], name: "index_reservations_on_reservable_type_and_reservable_id", using: :btree
   add_index "reservations", ["stp_invoice_id"], name: "index_reservations_on_stp_invoice_id", using: :btree
   add_index "reservations", ["user_id"], name: "index_reservations_on_user_id", using: :btree
 
   create_table "roles", force: :cascade do |t|
-    t.string   "name",          limit: 255
+    t.string   "name"
     t.integer  "resource_id"
-    t.string   "resource_type", limit: 255
+    t.string   "resource_type"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -420,8 +420,8 @@ ActiveRecord::Schema.define(version: 20160119131623) do
     t.datetime "updated_at"
     t.integer  "availability_id"
     t.datetime "ex_start_at"
-    t.datetime "canceled_at"
     t.datetime "ex_end_at"
+    t.datetime "canceled_at"
     t.boolean  "offered",         default: false
   end
 
@@ -430,18 +430,18 @@ ActiveRecord::Schema.define(version: 20160119131623) do
 
   create_table "statistic_fields", force: :cascade do |t|
     t.integer  "statistic_index_id"
-    t.string   "key",                limit: 255
-    t.string   "label",              limit: 255
+    t.string   "key"
+    t.string   "label"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "data_type",          limit: 255
+    t.string   "data_type"
   end
 
   add_index "statistic_fields", ["statistic_index_id"], name: "index_statistic_fields_on_statistic_index_id", using: :btree
 
   create_table "statistic_graphs", force: :cascade do |t|
     t.integer  "statistic_index_id"
-    t.string   "chart_type",         limit: 255
+    t.string   "chart_type"
     t.integer  "limit"
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -450,17 +450,17 @@ ActiveRecord::Schema.define(version: 20160119131623) do
   add_index "statistic_graphs", ["statistic_index_id"], name: "index_statistic_graphs_on_statistic_index_id", using: :btree
 
   create_table "statistic_indices", force: :cascade do |t|
-    t.string   "es_type_key", limit: 255
-    t.string   "label",       limit: 255
+    t.string   "es_type_key"
+    t.string   "label"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.boolean  "table",                   default: true
-    t.boolean  "ca",                      default: true
+    t.boolean  "table",       default: true
+    t.boolean  "ca",          default: true
   end
 
   create_table "statistic_sub_types", force: :cascade do |t|
-    t.string   "key",        limit: 255
-    t.string   "label",      limit: 255
+    t.string   "key"
+    t.string   "label"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -477,8 +477,8 @@ ActiveRecord::Schema.define(version: 20160119131623) do
 
   create_table "statistic_types", force: :cascade do |t|
     t.integer  "statistic_index_id"
-    t.string   "key",                limit: 255
-    t.string   "label",              limit: 255
+    t.string   "key"
+    t.string   "label"
     t.boolean  "graph"
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -496,7 +496,7 @@ ActiveRecord::Schema.define(version: 20160119131623) do
   create_table "subscriptions", force: :cascade do |t|
     t.integer  "plan_id"
     t.integer  "user_id"
-    t.string   "stp_subscription_id", limit: 255
+    t.string   "stp_subscription_id"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.datetime "expired_at"
@@ -515,15 +515,15 @@ ActiveRecord::Schema.define(version: 20160119131623) do
   add_index "tags", ["name"], name: "index_tags_on_name", unique: true, using: :btree
 
   create_table "themes", force: :cascade do |t|
-    t.string "name", limit: 255, null: false
+    t.string "name", null: false
   end
 
   create_table "trainings", force: :cascade do |t|
-    t.string   "name",            limit: 255
+    t.string   "name"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "nb_total_places"
-    t.string   "slug",            limit: 255
+    t.string   "slug"
     t.text     "description"
   end
 
@@ -579,32 +579,32 @@ ActiveRecord::Schema.define(version: 20160119131623) do
   add_index "user_trainings", ["user_id"], name: "index_user_trainings_on_user_id", using: :btree
 
   create_table "users", force: :cascade do |t|
-    t.string   "username",               limit: 255
-    t.string   "email",                  limit: 255, default: "",    null: false
-    t.string   "encrypted_password",     limit: 255, default: "",    null: false
-    t.string   "reset_password_token",   limit: 255
+    t.string   "email",                  default: "",    null: false
+    t.string   "encrypted_password",     default: "",    null: false
+    t.string   "reset_password_token"
     t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",                      default: 0,     null: false
+    t.integer  "sign_in_count",          default: 0,     null: false
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
-    t.string   "current_sign_in_ip",     limit: 255
-    t.string   "last_sign_in_ip",        limit: 255
-    t.string   "confirmation_token",     limit: 255
+    t.string   "current_sign_in_ip"
+    t.string   "last_sign_in_ip"
+    t.string   "confirmation_token"
     t.datetime "confirmed_at"
     t.datetime "confirmation_sent_at"
-    t.string   "unconfirmed_email",      limit: 255
-    t.integer  "failed_attempts",                    default: 0,     null: false
-    t.string   "unlock_token",           limit: 255
+    t.string   "unconfirmed_email"
+    t.integer  "failed_attempts",        default: 0,     null: false
+    t.string   "unlock_token"
     t.datetime "locked_at"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.boolean  "is_allow_contact",                   default: true
+    t.boolean  "is_allow_contact",       default: true
     t.integer  "group_id"
-    t.string   "stp_customer_id",        limit: 255
-    t.string   "slug",                   limit: 255
-    t.boolean  "is_active",                          default: true
-    t.boolean  "invoicing_disabled",                 default: false
+    t.string   "stp_customer_id"
+    t.string   "username"
+    t.string   "slug"
+    t.boolean  "is_active",              default: true
+    t.boolean  "invoicing_disabled",     default: false
     t.string   "provider"
     t.string   "uid"
     t.string   "auth_token"