diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp
index 217949d4..f2652ac8 100644
--- a/libraries/chain/db_block.cpp
+++ b/libraries/chain/db_block.cpp
@@ -640,23 +640,9 @@ const witness_object& database::validate_block_header( uint32_t skip, const sign
 
       witness_id_type scheduled_witness = get_scheduled_witness( slot_num );
 
-#warning REMOVE HARDFORK in final release check
-      if( next_block.block_num() > 58500 ) {
-         FC_ASSERT( next_block.witness == scheduled_witness, "Witness produced block at wrong time",
-                    ("block witness",next_block.witness)("scheduled",scheduled_witness)("slot_num",slot_num) );
-      } 
-   } /*else {
-      uint32_t slot_num = get_slot_at_time( next_block.timestamp );
-      FC_ASSERT( slot_num > 0 );
-
-      const witness_schedule_object& wso = witness_schedule_id_type()(*this);
-      const dynamic_global_property_object& dpo = get_dynamic_global_properties();
-
-      witness_id_type scheduled_witness = get_scheduled_witness( slot_num );
-      if( next_block.witness != scheduled_witness )
-         edump( (next_block.block_num())(next_block.witness)(scheduled_witness)(slot_num)(wso)(dpo.current_aslot) );
+      FC_ASSERT( next_block.witness == scheduled_witness, "Witness produced block at wrong time",
+                 ("block witness",next_block.witness)("scheduled",scheduled_witness)("slot_num",slot_num) );
    }
-   */
 
    return witness;
 }
diff --git a/libraries/chain/db_maint.cpp b/libraries/chain/db_maint.cpp
index 20541344..748681b7 100644
--- a/libraries/chain/db_maint.cpp
+++ b/libraries/chain/db_maint.cpp
@@ -47,7 +47,7 @@ vector<std::reference_wrapper<const typename Index::object_type>> database::sort
 template<class... Types>
 void database::perform_account_maintenance(std::tuple<Types...> helpers)
 {
-   const auto& idx = get_index_type<account_index>().indices();
+   const auto& idx = get_index_type<account_index>().indices().get<by_name>();
    for( const account_object& a : idx )
       detail::for_each(helpers, a, detail::gen_seq<sizeof...(Types)>());
 }
diff --git a/libraries/chain/include/graphene/chain/account_object.hpp b/libraries/chain/include/graphene/chain/account_object.hpp
index 27c80523..44cd4218 100644
--- a/libraries/chain/include/graphene/chain/account_object.hpp
+++ b/libraries/chain/include/graphene/chain/account_object.hpp
@@ -288,7 +288,7 @@ namespace graphene { namespace chain {
       account_balance_object,
       indexed_by<
          ordered_unique< tag<by_id>, member< object, object_id_type, &object::id > >,
-         hashed_unique< tag<by_balance>, composite_key<
+         ordered_unique< tag<by_balance>, composite_key<
             account_balance_object,
             member<account_balance_object, account_id_type, &account_balance_object::owner>,
             member<account_balance_object, asset_id_type, &account_balance_object::asset_type> >
@@ -311,7 +311,7 @@ namespace graphene { namespace chain {
    typedef multi_index_container<
       account_object,
       indexed_by<
-         hashed_unique< tag<by_id>, member< object, object_id_type, &object::id > >,
+         ordered_unique< tag<by_id>, member< object, object_id_type, &object::id > >,
          ordered_unique< tag<by_name>, member<account_object, string, &account_object::name> >
       >
    > account_multi_index_type;
diff --git a/libraries/chain/include/graphene/chain/asset_object.hpp b/libraries/chain/include/graphene/chain/asset_object.hpp
index 6586c5a7..f9328be8 100644
--- a/libraries/chain/include/graphene/chain/asset_object.hpp
+++ b/libraries/chain/include/graphene/chain/asset_object.hpp
@@ -215,7 +215,7 @@ namespace graphene { namespace chain {
    typedef multi_index_container<
       asset_bitasset_data_object,
       indexed_by<
-         hashed_unique< tag<by_id>, member< object, object_id_type, &object::id > >,
+         ordered_unique< tag<by_id>, member< object, object_id_type, &object::id > >,
          ordered_non_unique< tag<by_feed_expiration>,
             const_mem_fun< asset_bitasset_data_object, time_point_sec, &asset_bitasset_data_object::feed_expiration_time >
          >
@@ -227,7 +227,7 @@ namespace graphene { namespace chain {
    typedef multi_index_container<
       asset_object,
       indexed_by<
-         hashed_unique< tag<by_id>, member< object, object_id_type, &object::id > >,
+         ordered_unique< tag<by_id>, member< object, object_id_type, &object::id > >,
          ordered_unique< tag<by_symbol>, member<asset_object, string, &asset_object::symbol> >
       >
    > asset_object_multi_index_type;
diff --git a/libraries/chain/include/graphene/chain/balance_object.hpp b/libraries/chain/include/graphene/chain/balance_object.hpp
index 82828f7c..342a1ce3 100644
--- a/libraries/chain/include/graphene/chain/balance_object.hpp
+++ b/libraries/chain/include/graphene/chain/balance_object.hpp
@@ -33,7 +33,7 @@ namespace graphene { namespace chain {
    using balance_multi_index_type = multi_index_container<
       balance_object,
       indexed_by<
-         hashed_unique< tag<by_id>, member< object, object_id_type, &object::id > >,
+         ordered_unique< tag<by_id>, member< object, object_id_type, &object::id > >,
          ordered_non_unique< tag<by_owner>, composite_key<
             balance_object,
             member<balance_object, address, &balance_object::owner>,
diff --git a/libraries/chain/include/graphene/chain/committee_member_object.hpp b/libraries/chain/include/graphene/chain/committee_member_object.hpp
index 2ab34ac7..6d12da99 100644
--- a/libraries/chain/include/graphene/chain/committee_member_object.hpp
+++ b/libraries/chain/include/graphene/chain/committee_member_object.hpp
@@ -56,10 +56,10 @@ namespace graphene { namespace chain {
          ordered_unique< tag<by_id>,
             member<object, object_id_type, &object::id>
          >,
-         hashed_unique< tag<by_account>,
+         ordered_unique< tag<by_account>,
             member<committee_member_object, account_id_type, &committee_member_object::committee_member_account>
          >,
-         hashed_unique< tag<by_vote_id>,
+         ordered_unique< tag<by_vote_id>,
             member<committee_member_object, vote_id_type, &committee_member_object::vote_id>
          >
       >
diff --git a/libraries/chain/include/graphene/chain/market_evaluator.hpp b/libraries/chain/include/graphene/chain/market_evaluator.hpp
index 5f60c12f..d23e19ff 100644
--- a/libraries/chain/include/graphene/chain/market_evaluator.hpp
+++ b/libraries/chain/include/graphene/chain/market_evaluator.hpp
@@ -45,7 +45,7 @@ namespace graphene { namespace chain {
   typedef multi_index_container<
      limit_order_object,
      indexed_by<
-        hashed_unique< tag<by_id>,
+        ordered_unique< tag<by_id>,
            member< object, object_id_type, &object::id > >,
         ordered_non_unique< tag<by_expiration>, member< limit_order_object, time_point_sec, &limit_order_object::expiration> >,
         ordered_unique< tag<by_price>,
@@ -112,7 +112,7 @@ namespace graphene { namespace chain {
    typedef multi_index_container<
       call_order_object,
       indexed_by<
-         hashed_unique< tag<by_id>,
+         ordered_unique< tag<by_id>,
             member< object, object_id_type, &object::id > >,
          ordered_unique< tag<by_price>,
             composite_key< call_order_object,
@@ -140,7 +140,7 @@ namespace graphene { namespace chain {
    typedef multi_index_container<
       force_settlement_object,
       indexed_by<
-         hashed_unique< tag<by_id>, member< object, object_id_type, &object::id > >,
+         ordered_unique< tag<by_id>, member< object, object_id_type, &object::id > >,
          ordered_non_unique< tag<by_account>,
             member<force_settlement_object, account_id_type, &force_settlement_object::owner>
          >,
diff --git a/libraries/chain/include/graphene/chain/proposal_object.hpp b/libraries/chain/include/graphene/chain/proposal_object.hpp
index eb8d890c..db5f76c1 100644
--- a/libraries/chain/include/graphene/chain/proposal_object.hpp
+++ b/libraries/chain/include/graphene/chain/proposal_object.hpp
@@ -76,7 +76,7 @@ struct by_expiration{};
 typedef boost::multi_index_container<
    proposal_object,
    indexed_by<
-      hashed_unique< tag< by_id >, member< object, object_id_type, &object::id > >,
+      ordered_unique< tag< by_id >, member< object, object_id_type, &object::id > >,
       ordered_non_unique< tag< by_expiration >, member< proposal_object, time_point_sec, &proposal_object::expiration_time > >
    >
 > proposal_multi_index_container;
diff --git a/libraries/chain/include/graphene/chain/transaction_object.hpp b/libraries/chain/include/graphene/chain/transaction_object.hpp
index 80be41bf..de963968 100644
--- a/libraries/chain/include/graphene/chain/transaction_object.hpp
+++ b/libraries/chain/include/graphene/chain/transaction_object.hpp
@@ -56,7 +56,7 @@ namespace graphene { namespace chain {
    typedef multi_index_container<
       transaction_object,
       indexed_by<
-         hashed_unique< tag<by_id>, member< object, object_id_type, &object::id > >,
+         ordered_unique< tag<by_id>, member< object, object_id_type, &object::id > >,
          hashed_unique< tag<by_trx_id>, BOOST_MULTI_INDEX_MEMBER(transaction_object, transaction_id_type, trx_id), std::hash<transaction_id_type> >,
          ordered_non_unique< tag<by_expiration>, const_mem_fun<transaction_object, time_point_sec, &transaction_object::get_expiration > >
       >
diff --git a/libraries/chain/include/graphene/chain/vesting_balance_object.hpp b/libraries/chain/include/graphene/chain/vesting_balance_object.hpp
index ee14dc89..8e94eb36 100644
--- a/libraries/chain/include/graphene/chain/vesting_balance_object.hpp
+++ b/libraries/chain/include/graphene/chain/vesting_balance_object.hpp
@@ -168,7 +168,7 @@ namespace graphene { namespace chain {
    typedef multi_index_container<
       vesting_balance_object,
       indexed_by<
-         hashed_unique< tag<by_id>, member< object, object_id_type, &object::id > >,
+         ordered_unique< tag<by_id>, member< object, object_id_type, &object::id > >,
          ordered_non_unique< tag<by_account>,
             member<vesting_balance_object, account_id_type, &vesting_balance_object::owner>
          >
diff --git a/libraries/chain/include/graphene/chain/withdraw_permission_object.hpp b/libraries/chain/include/graphene/chain/withdraw_permission_object.hpp
index 145ab5bf..cba5e626 100644
--- a/libraries/chain/include/graphene/chain/withdraw_permission_object.hpp
+++ b/libraries/chain/include/graphene/chain/withdraw_permission_object.hpp
@@ -71,9 +71,9 @@ namespace graphene { namespace chain {
    typedef multi_index_container<
       withdraw_permission_object,
       indexed_by<
-         hashed_unique< tag<by_id>, member< object, object_id_type, &object::id > >,
-         hashed_non_unique< tag<by_from>, member<withdraw_permission_object, account_id_type, &withdraw_permission_object::withdraw_from_account> >,
-         hashed_non_unique< tag<by_authorized>, member<withdraw_permission_object, account_id_type, &withdraw_permission_object::authorized_account> >,
+         ordered_unique< tag<by_id>, member< object, object_id_type, &object::id > >,
+         ordered_non_unique< tag<by_from>, member<withdraw_permission_object, account_id_type, &withdraw_permission_object::withdraw_from_account> >,
+         ordered_non_unique< tag<by_authorized>, member<withdraw_permission_object, account_id_type, &withdraw_permission_object::authorized_account> >,
          ordered_non_unique< tag<by_expiration>, member<withdraw_permission_object, time_point_sec, &withdraw_permission_object::expiration> >
       >
    > withdraw_permission_object_multi_index_type;
diff --git a/libraries/chain/include/graphene/chain/witness_object.hpp b/libraries/chain/include/graphene/chain/witness_object.hpp
index e3ac8fba..c2cc6b31 100644
--- a/libraries/chain/include/graphene/chain/witness_object.hpp
+++ b/libraries/chain/include/graphene/chain/witness_object.hpp
@@ -50,13 +50,13 @@ namespace graphene { namespace chain {
    using witness_multi_index_type = multi_index_container<
       witness_object,
       indexed_by<
-         hashed_unique< tag<by_id>,
+         ordered_unique< tag<by_id>,
             member<object, object_id_type, &object::id>
          >,
-         hashed_unique< tag<by_account>,
+         ordered_unique< tag<by_account>,
             member<witness_object, account_id_type, &witness_object::witness_account>
          >,
-         hashed_unique< tag<by_vote_id>,
+         ordered_unique< tag<by_vote_id>,
             member<witness_object, vote_id_type, &witness_object::vote_id>
          >
       >