diff --git a/config/config.json b/config/config.json
index 84475202bf..29217ad194 100644
--- a/config/config.json
+++ b/config/config.json
@@ -501,7 +501,7 @@
         {
           "blockchain_title": "xDai",
           "network_id": "xdai:mainnet",
-          "rpc_server_url": "https://xdai.poanetwork.dev",
+          "rpc_server_url": "https://rpc.xdaichain.com/origintrail/",
           "hub_contract_address": "0xB4Cf5D3876FA929706A87F3B4042C741dcb3d688",
           "identity_filepath": "xdai_erc725_identity.json",
           "gas_limit": "2000000",
diff --git a/modules/Blockchain/Web3Implementation/Transactions.js b/modules/Blockchain/Web3Implementation/Transactions.js
index 0eb3eb5596..baa6060c84 100644
--- a/modules/Blockchain/Web3Implementation/Transactions.js
+++ b/modules/Blockchain/Web3Implementation/Transactions.js
@@ -163,6 +163,7 @@ class Transactions {
                 if (Object.keys(receipt).length > 0) {
                     break;
                 }
+                this.logger.warn(`Failed to fetch transaction receipt from empty response on attempt ${i + 1}.`);
             } catch (e) {
                 this.logger.warn(`Failed to fetch transaction receipt. Error: ${e.toString()}`);
             }
diff --git a/testnet/register-node.js b/testnet/register-node.js
index 8b0a8027da..1796d6ccc5 100644
--- a/testnet/register-node.js
+++ b/testnet/register-node.js
@@ -256,23 +256,6 @@ exec /usr/bin/supervisord -c /ot-node/current/testnet/supervisord.conf
             externalConfig = JSON.parse(fs.readFileSync(localConfigPath, 'utf8'));
         }
 
-        if (process.env.ERC_725_IDENTITY) {
-            const erc725IdentityFilePath = path.join(
-                localConfiguration.appDataPath,
-                localConfiguration.erc725_identity_filepath,
-            );
-            const content = { identity: process.env.ERC_725_IDENTITY };
-            fs.writeFileSync(erc725IdentityFilePath, JSON.stringify(content, null, 4));
-            logger.info('Identity given: ', process.env.ERC_725_IDENTITY);
-        }
-
-        if (process.env.IMPORT_WHITELIST) {
-            if (!externalConfig.network) {
-                externalConfig.network = {};
-            }
-            externalConfig.network.remoteWhitelist = process.env.IMPORT_WHITELIST.split(',');
-        }
-
         deepExtend(localConfiguration, externalConfig);
         logger.info('Configuration:');
         // Mask private key before printing it.