diff --git a/src/currency_core/currency_format_utils.h b/src/currency_core/currency_format_utils.h
index b3cfbeed..4d457150 100644
--- a/src/currency_core/currency_format_utils.h
+++ b/src/currency_core/currency_format_utils.h
@@ -925,9 +925,9 @@ namespace currency
     if (crc.is_hardfork_active_for_height(2, top_block_height))
     {
       // after hardfork 2
-      tx_payer result = AUTO_VAL_INIT(result);
-      result.acc_addr = addr;
-      container.push_back(result);
+      //tx_payer result = AUTO_VAL_INIT(result);
+      //result.acc_addr = addr;
+      //container.push_back(result);
     }
     else
     {
@@ -947,9 +947,9 @@ namespace currency
     if (crc.is_hardfork_active_for_height(2, top_block_height))
     {
       // after hardfork 2
-      tx_receiver result = AUTO_VAL_INIT(result);
-      result.acc_addr = addr;
-      container.push_back(result);
+      //tx_receiver result = AUTO_VAL_INIT(result);
+      //result.acc_addr = addr;
+      //container.push_back(result);
     }
     else
     {
diff --git a/tests/core_tests/chaingen_main.cpp b/tests/core_tests/chaingen_main.cpp
index 38952ed1..f20f03c0 100644
--- a/tests/core_tests/chaingen_main.cpp
+++ b/tests/core_tests/chaingen_main.cpp
@@ -1260,8 +1260,8 @@ int main(int argc, char* argv[])
     GENERATE_AND_PLAY(hard_fork_1_pos_and_locked_coins);
 
     // Hardfork 2 tests
-    GENERATE_AND_PLAY(hard_fork_2_tx_payer_in_wallet);
-    GENERATE_AND_PLAY(hard_fork_2_tx_receiver_in_wallet);
+    //GENERATE_AND_PLAY(hard_fork_2_tx_payer_in_wallet);
+    //GENERATE_AND_PLAY(hard_fork_2_tx_receiver_in_wallet);
     GENERATE_AND_PLAY(hard_fork_2_tx_extra_alias_entry_in_wallet);
     GENERATE_AND_PLAY_HF(hard_fork_2_auditable_addresses_basics, "2-*");
     GENERATE_AND_PLAY(hard_fork_2_no_new_structures_before_hf);
diff --git a/tests/core_tests/wallet_rpc_tests.cpp b/tests/core_tests/wallet_rpc_tests.cpp
index 7a395d9f..9ac9fc2d 100644
--- a/tests/core_tests/wallet_rpc_tests.cpp
+++ b/tests/core_tests/wallet_rpc_tests.cpp
@@ -324,8 +324,8 @@ bool wallet_rpc_transfer::c1(currency::core& c, size_t ev_index, const std::vect
 
   // make sure tx_received is set by default, but tx_payer is not
   std::shared_ptr<const transaction_chain_entry> pche = c.get_blockchain_storage().get_tx_chain_entry(td.tx_hash());
-  CHECK_AND_ASSERT_MES(currency::count_type_in_variant_container<tx_receiver>(pche->tx.extra) == 1, false, "tx_receiver: incorrect count of items");
-  CHECK_AND_ASSERT_MES(currency::count_type_in_variant_container<tx_payer>(pche->tx.extra) == 0, false, "tx_payer: incorrect count of items");
+  //CHECK_AND_ASSERT_MES(currency::count_type_in_variant_container<tx_receiver>(pche->tx.extra) == 1, false, "tx_receiver: incorrect count of items");
+  //CHECK_AND_ASSERT_MES(currency::count_type_in_variant_container<tx_payer>(pche->tx.extra) == 0, false, "tx_payer: incorrect count of items");
 
 
   // 2. check tx_receiver and tx_payer non-default
@@ -357,8 +357,8 @@ bool wallet_rpc_transfer::c1(currency::core& c, size_t ev_index, const std::vect
 
   // make sure tx_received is set by default, but tx_payer is not
   pche = c.get_blockchain_storage().get_tx_chain_entry(td.tx_hash());
-  CHECK_AND_ASSERT_MES(currency::count_type_in_variant_container<tx_receiver>(pche->tx.extra) == 0, false, "tx_receiver: incorrect count of items");
-  CHECK_AND_ASSERT_MES(currency::count_type_in_variant_container<tx_payer>(pche->tx.extra) == 1, false, "tx_payer: incorrect count of items");
+  //CHECK_AND_ASSERT_MES(currency::count_type_in_variant_container<tx_receiver>(pche->tx.extra) == 0, false, "tx_receiver: incorrect count of items");
+  //CHECK_AND_ASSERT_MES(currency::count_type_in_variant_container<tx_payer>(pche->tx.extra) == 1, false, "tx_payer: incorrect count of items");
 
 
   return true;