diff --git a/apps/arweave/src/ar_http_iface_middleware.erl b/apps/arweave/src/ar_http_iface_middleware.erl
index 207bcfc78..e08b0eeae 100644
--- a/apps/arweave/src/ar_http_iface_middleware.erl
+++ b/apps/arweave/src/ar_http_iface_middleware.erl
@@ -1839,18 +1839,11 @@ handle_get_block(H, Req, Pid, Encoding) ->
 	end.
 
 handle_get_block2(H, Req, Encoding) ->
-	ReadB =
-		case ar_randomx_state:get_key_block(H) of
-			not_found ->
-				ar_storage:read_block(H);
-			{ok, B} ->
-				B
-		end,
-	case ReadB of
+	case ar_storage:read_block(H) of
 		unavailable ->
 			{404, #{}, <<"Block not found.">>, Req};
-		#block{} ->
-			handle_get_block3(ReadB, Req, Encoding)
+		#block{} = B ->
+			handle_get_block3(B, Req, Encoding)
 	end.
 
 handle_get_block3(B, Req, Encoding) ->
diff --git a/apps/arweave/src/ar_node_worker.erl b/apps/arweave/src/ar_node_worker.erl
index 9612803a2..f73dc0917 100644
--- a/apps/arweave/src/ar_node_worker.erl
+++ b/apps/arweave/src/ar_node_worker.erl
@@ -86,9 +86,6 @@ init([]) ->
 	%% Trap exit to avoid corrupting any open files on quit.
 	process_flag(trap_exit, true),
 	[ok, ok, ok, ok, ok] = ar_events:subscribe([tx, block, nonce_limiter, miner, node_state]),
-	%% Initialize RandomX.
-	ar_randomx_state:start(),
-	ar_randomx_state:start_block_polling(),
 	%% Read persisted mempool.
 	ar_mempool:load_from_disk(),
 	%% Join the network.
diff --git a/apps/arweave/src/ar_randomx_state.erl b/apps/arweave/src/ar_randomx_state.erl
deleted file mode 100644
index f284c1822..000000000
--- a/apps/arweave/src/ar_randomx_state.erl
+++ /dev/null
@@ -1,251 +0,0 @@
--module(ar_randomx_state).
-
--export([init/2, init/4, start/0, start_block_polling/0, reset/0,
-		randomx_state_by_height/1, swap_height/1, get_key_block/1,
-		debug_server/0]).
-
--include_lib("arweave/include/ar.hrl").
-
--record(state, {
-	randomx_states,
-	key_cache,
-	next_key_gen_ahead
-}).
-
-%%%===================================================================
-%%% Public interface.
-%%%===================================================================
-
-init(BI, Peers) ->
-	CurrentHeight = length(BI) - 1,
-	SwapHeights = lists:usort([
-		swap_height(CurrentHeight + ?STORE_BLOCKS_BEHIND_CURRENT),
-		swap_height(max(0, CurrentHeight - ?STORE_BLOCKS_BEHIND_CURRENT))
-	]),
-	Init = fun(SwapHeight) ->
-		{ok, Key} = randomx_key(SwapHeight, BI, Peers),
-		init(whereis(?MODULE), SwapHeight, Key, erlang:system_info(schedulers_online))
-	end,
-	lists:foreach(Init, SwapHeights).
-
-init(Server, SwapHeight, Key, Threads) ->
-	ar:console(
-		"Initialising RandomX dataset for fast hashing. Swap height: ~p, Key: ~p. "
-		"The process may take several minutes.~n", [SwapHeight, ar_util:encode(Key)]
-	),
-	Server ! {add_randomx_state, SwapHeight, {fast, ar_mine_randomx:init_fast(Key, Threads)}},
-	ar:console("RandomX dataset initialisation for swap height ~p complete.~n", [SwapHeight]).
-
-start() ->
-	case whereis(?MODULE) of
-		undefined ->
-			Pid = spawn_link(fun server/0),
-			register(?MODULE, Pid),
-			Pid;
-		Pid when is_pid(Pid) ->
-			Pid
-	end.
-
-start_block_polling() ->
-	whereis(?MODULE) ! poll_new_blocks.
-
-reset() ->
-	whereis(?MODULE) ! reset.
-
-randomx_state_by_height(Height) when is_integer(Height) andalso Height >= 0 ->
-	Ref = make_ref(),
-	whereis(?MODULE) ! {get_state_by_height, Height, Ref, self()},
-	receive
-		{Ref, {state_by_height, {ok, State}}} ->
-			{state, State};
-		{Ref, {state_by_height, {state_not_found, key_not_found}}} ->
-			SwapHeight = swap_height(Height),
-			{ok, Key} = randomx_key(SwapHeight),
-			{key, Key};
-		{Ref, {state_by_height, {state_not_found, Key}}} ->
-			{key, Key}
-	end.
-
-swap_height(Height) ->
-	(Height div ?RANDOMX_KEY_SWAP_FREQ) * ?RANDOMX_KEY_SWAP_FREQ.
-
-get_key_block(H) ->
-	case ets:lookup(ar_randomx_state_key_blocks, H) of
-		[{_, B}] ->
-			{ok, B};
-		_ ->
-			not_found
-	end.
-
-debug_server() ->
-	whereis(?MODULE) ! {get_state, self()},
-	receive
-		{state, State} -> State
-	end.
-
-%%%===================================================================
-%%% Private functions.
-%%%===================================================================
-
-server() ->
-	server(init_state()).
-
-init_state() ->
-	set_next_key_gen_ahead(#state{
-		randomx_states = #{},
-		key_cache = #{}
-	}).
-
-set_next_key_gen_ahead(State) ->
-	State#state{
-		next_key_gen_ahead = rand_int(?RANDOMX_MIN_KEY_GEN_AHEAD, ?RANDOMX_MAX_KEY_GEN_AHEAD)
-	}.
-
-rand_int(Min, Max) ->
-	rand:uniform(Max - Min) + Min - 1.
-
-server(State) ->
-	NewState = receive
-		poll_new_blocks ->
-			poll_new_blocks(State);
-		{add_randomx_state, SwapHeight, RandomxState} ->
-			State#state{
-				randomx_states = maps:put(SwapHeight, RandomxState, State#state.randomx_states)
-			};
-		{get_state_by_height, Height, Ref, From} ->
-			case maps:find(swap_height(Height), State#state.randomx_states) of
-				error ->
-					Key = get_key_from_cache(State, Height),
-					From ! {Ref, {state_by_height, {state_not_found, Key}}};
-				{ok, initializing} ->
-					Key = get_key_from_cache(State, Height),
-					From ! {Ref, {state_by_height, {state_not_found, Key}}};
-				{ok, RandomxState} ->
-					From ! {Ref, {state_by_height, {ok, RandomxState}}}
-			end,
-			State;
-		{get_state, From} ->
-			From ! {state, State},
-			State;
-		{cache_randomx_key, SwapHeight, KeyB} ->
-			Key = KeyB#block.hash,
-			cache_key_block(KeyB),
-			State#state{ key_cache = maps:put(SwapHeight, Key, State#state.key_cache) };
-		reset ->
-			init_state()
-	end,
-	server(NewState).
-
-cache_key_block(B) ->
-	ets:insert(ar_randomx_state_key_blocks, {B#block.indep_hash, B}),
-	ets:insert(ar_randomx_state_key_heights, {B#block.height, B#block.indep_hash}),
-	case ets:info(ar_randomx_state_key_heights, size) > 10 of
-		true ->
-			OldestHeight = ets:first(ar_randomx_state_key_heights),
-			[{_, OldestH}] = ets:lookup(ar_randomx_state_key_heights, OldestHeight),
-			ets:delete(ar_randomx_state_key_heights, OldestHeight),
-			ets:delete(ar_randomx_state_key_blocks, OldestH);
-		false ->
-			ok
-	end.
-
-poll_new_blocks(State) ->
-	case ar_node:is_joined() of
-		false ->
-			%% Add an extra poll soon
-			timer:send_after(1000, poll_new_blocks),
-			State;
-		true ->
-			self() ! reset,
-			State
-	end.
-
-get_key_from_cache(State, Height) ->
-	maps:get(swap_height(Height), State#state.key_cache, key_not_found).
-
-
-%% @doc Return the key used in RandomX by key swap height. The key is the
-%% dependent hash from the block at the previous swap height. If RandomX is used
-%% already by the first ?RANDOMX_KEY_SWAP_FREQ blocks, then a hardcoded key is
-%% used since there is no old enough block to fetch the key from.
-randomx_key(SwapHeight) when SwapHeight < ?RANDOMX_KEY_SWAP_FREQ ->
-	{ok, <<"Arweave Genesis RandomX Key">>};
-randomx_key(SwapHeight) ->
-	KeyBlockHeight = SwapHeight - ?RANDOMX_KEY_SWAP_FREQ,
-	case get_block(KeyBlockHeight) of
-		{ok, KeyB} ->
-			Key = KeyB#block.hash,
-			whereis(?MODULE) ! {cache_randomx_key, SwapHeight, KeyB},
-			{ok, Key};
-		unavailable ->
-			unavailable
-	end.
-
-get_block(Height) when is_integer(Height) ->
-	case ar_block_index:get_element_by_height(Height) of
-		not_found ->
-			unavailable;
-		{BH, _, _} ->
-			get_block(BH)
-	end;
-get_block(BH) ->
-	try
-		Peers = ar_peers:get_peers(lifetime),
-		get_block(BH, Peers)
-	catch Type:Exception:StackTrace ->
-		?LOG_ERROR([
-			{event, randomx_state_server_failed_to_fetch_peers},
-			{error, io_lib:format("~p ~p ~p", [Type, Exception, StackTrace])}
-		]),
-		get_block(BH)
-	end.
-
-get_block(Height, BI, Peers) when is_integer(Height) ->
-	{BH, _, _} = lists:nth(Height + 1, lists:reverse(BI)),
-	get_block(BH, Peers).
-
-get_block(BH, Peers) ->
-	get_block2(BH, Peers, 5).
-
-get_block2(_BH, _Peers, 0) ->
-	unavailable;
-get_block2(BH, Peers, RetryCount) ->
-	case ar_storage:read_block(BH) of
-		B when is_record(B, block) ->
-			{ok, B};
-		unavailable ->
-			case ar_http_iface_client:get_block_shadow(Peers, BH) of
-				unavailable ->
-					?LOG_WARNING([{event, failed_to_get_randomx_key_block},
-							{block, ar_util:encode(BH)},
-							{peers, string:join([ar_util:format_peer(Peer) || Peer <- Peers],
-									", ")}]),
-					timer:sleep(2000),
-					get_block2(BH, Peers, RetryCount - 1);
-				{Peer, B, Time, BlockSize} ->
-					case ar_block:indep_hash(B) of
-						BH ->
-							ar_peers:rate_fetched_data(Peer, block, Time, BlockSize),
-							{ok, B};
-						InvalidBH ->
-							?LOG_WARNING([
-								{event, ar_randomx_state_got_invalid_block},
-								{requested_block_hash, ar_util:encode(BH)},
-								{received_block_hash, ar_util:encode(InvalidBH)}
-							]),
-							get_block(BH, Peers)
-					end
-			end
-	end.
-
-randomx_key(SwapHeight, _, _) when SwapHeight < ?RANDOMX_KEY_SWAP_FREQ ->
-	randomx_key(SwapHeight);
-randomx_key(SwapHeight, BI, Peers) ->
-	KeyBlockHeight = SwapHeight - ?RANDOMX_KEY_SWAP_FREQ,
-	case get_block(KeyBlockHeight, BI, Peers) of
-		{ok, KeyB} ->
-			whereis(?MODULE) ! {cache_randomx_key, SwapHeight, KeyB},
-			{ok, KeyB#block.hash};
-		unavailable ->
-			unavailable
-	end.
diff --git a/apps/arweave/src/ar_sup.erl b/apps/arweave/src/ar_sup.erl
index 35e3f0457..cb9279b1c 100644
--- a/apps/arweave/src/ar_sup.erl
+++ b/apps/arweave/src/ar_sup.erl
@@ -33,8 +33,6 @@ init([]) ->
 	ets:new(ar_peers, [set, public, named_table, {read_concurrency, true}]),
 	ets:new(ar_http, [set, public, named_table]),
 	ets:new(ar_blacklist_middleware, [set, public, named_table]),
-	ets:new(ar_randomx_state_key_blocks, [set, public, named_table]),
-	ets:new(ar_randomx_state_key_heights, [ordered_set, public, named_table]),
 	ets:new(blacklist, [set, public, named_table]),
 	ets:new(ignored_ids, [bag, public, named_table]),
 	ets:new(ar_tx_emitter_recently_emitted, [set, public, named_table]),