diff --git a/nano/core_test/ledger_walker.cpp b/nano/core_test/ledger_walker.cpp
index 6c8aef22..59ce8242 100644
--- a/nano/core_test/ledger_walker.cpp
+++ b/nano/core_test/ledger_walker.cpp
@@ -65,7 +65,7 @@ TEST (ledger_walker, genesis_account_longer)
 
 	const auto transaction = node->ledger.store.tx_begin_read ();
 	nano::account_info genesis_account_info{};
-	ASSERT_FALSE (node->ledger.store.account.get (transaction, nano::nano_dev_account, genesis_account_info));
+	ASSERT_FALSE (node->ledger.store.account.get (transaction, nano::dev::genesis_key.pub, genesis_account_info));
 	EXPECT_EQ (get_number_of_walked_blocks (genesis_account_info.open_block), 1);
 	EXPECT_EQ (get_number_of_walked_blocks (genesis_account_info.head), 1);
 
@@ -76,7 +76,7 @@ TEST (ledger_walker, genesis_account_longer)
 		ASSERT_TRUE (send);
 		EXPECT_EQ (get_number_of_walked_blocks (send->hash ()), 1 + itr * 2 - 1);
 		ASSERT_TIMELY (3s, 1 + itr * 2 == node->ledger.cache.cemented_count);
-		ASSERT_FALSE (node->ledger.store.account.get (transaction, nano::nano_dev_account, genesis_account_info));
+		ASSERT_FALSE (node->ledger.store.account.get (transaction, nano::dev::genesis_key.pub, genesis_account_info));
 		// TODO: check issue with account head
 		// EXPECT_EQ(get_number_of_walked_blocks (genesis_account_info.head), 1 + itr * 2);
 	}
diff --git a/nano/secure/common.cpp b/nano/secure/common.cpp
index 3ef5c04b..0f46a198 100644
--- a/nano/secure/common.cpp
+++ b/nano/secure/common.cpp
@@ -108,7 +108,6 @@ nano::ledger_constants::ledger_constants (nano::network_constants & network_cons
 
 nano::ledger_constants::ledger_constants (nano::networks network_a) :
 	zero_key ("0"),
-	nano_dev_account (dev_public_key_data),
 	nano_beta_account (beta_public_key_data),
 	nano_live_account (live_public_key_data),
 	nano_test_account (test_public_key_data),
@@ -139,7 +138,7 @@ nano::ledger_constants::ledger_constants (nano::networks network_a) :
 	nano::account nano_live_epoch_v2_signer;
 	auto error (nano_live_epoch_v2_signer.decode_account ("nano_3qb6o6i1tkzr6jwr5s7eehfxwg9x6eemitdinbpi7u8bjjwsgqfj4wzser3x"));
 	debug_assert (!error);
-	auto epoch_v2_signer (network_a == nano::networks::nano_dev_network ? nano_dev_account : network_a == nano::networks::nano_beta_network ? nano_beta_account : network_a == nano::networks::nano_test_network ? nano_test_account : nano_live_epoch_v2_signer);
+	auto epoch_v2_signer (network_a == nano::networks::nano_dev_network ? nano::dev::genesis_key.pub : network_a == nano::networks::nano_beta_network ? nano_beta_account : network_a == nano::networks::nano_test_network ? nano_test_account : nano_live_epoch_v2_signer);
 	const char * epoch_message_v2 ("epoch v2 block");
 	strncpy ((char *)epoch_link_v2.bytes.data (), epoch_message_v2, epoch_link_v2.bytes.size ());
 	epochs.add (nano::epoch::epoch_2, epoch_v2_signer, epoch_link_v2);
diff --git a/nano/secure/common.hpp b/nano/secure/common.hpp
index bce7c83a..06cf4762 100644
--- a/nano/secure/common.hpp
+++ b/nano/secure/common.hpp
@@ -371,7 +371,6 @@ public:
 	nano::account genesis_account () const;
 	nano::block_hash genesis_hash () const;
 	nano::keypair zero_key;
-	nano::account nano_dev_account;
 	nano::account nano_beta_account;
 	nano::account nano_live_account;
 	nano::account nano_test_account;
diff --git a/nano/test_common/testutil.cpp b/nano/test_common/testutil.cpp
index 1643f17d..aea9951a 100644
--- a/nano/test_common/testutil.cpp
+++ b/nano/test_common/testutil.cpp
@@ -15,7 +15,6 @@ namespace
 nano::ledger_constants dev_constants (nano::networks::nano_dev_network);
 }
 
-nano::account const & nano::nano_dev_account (dev_constants.nano_dev_account);
 nano::uint128_t const & nano::genesis_amount (dev_constants.genesis_amount);
 
 void nano::wait_peer_connections (nano::system & system_a)
diff --git a/nano/test_common/testutil.hpp b/nano/test_common/testutil.hpp
index 082344da..7210f3b4 100644
--- a/nano/test_common/testutil.hpp
+++ b/nano/test_common/testutil.hpp
@@ -53,7 +53,6 @@ class telemetry_data;
 class network_params;
 class system;
 
-extern nano::public_key const & nano_dev_account;
 extern nano::uint128_t const & genesis_amount;
 
 class stringstream_mt_sink : public boost::iostreams::sink