diff --git a/pkg/eth/backend.go b/pkg/eth/backend.go
index 5b5a0114..152290a9 100644
--- a/pkg/eth/backend.go
+++ b/pkg/eth/backend.go
@@ -103,7 +103,7 @@ const (
 			AND header_cids.block_hash = (SELECT canonical_header_hash(header_cids.block_number))
 			ORDER BY block_number DESC
 			LIMIT 1`
-	RetrieveBlockNumberAndStateLeafKeyForStorageRoot = `SELECT block_number, state_leaf_key
+	RetrieveBlockNumberAndStateLeafKeyForStorageRoot = `SELECT state_accounts.block_number, state_leaf_key
 			FROM eth.state_cids, eth.state_accounts
 			WHERE state_accounts.storage_root = $1
 			AND state_cids.state_path = state_accounts.state_path
diff --git a/pkg/eth/ipld_retriever.go b/pkg/eth/ipld_retriever.go
index c12ed34d..ca5b1a21 100644
--- a/pkg/eth/ipld_retriever.go
+++ b/pkg/eth/ipld_retriever.go
@@ -34,10 +34,6 @@ import (
 )
 
 const (
-	// node type removed value.
-	// https://github.com/cerc-io/go-ethereum/blob/271f4d01e7e2767ffd8e0cd469bf545be96f2a84/statediff/indexer/helpers.go#L34
-	removedNode = 3
-
 	RetrieveHeadersByHashesPgStr = `SELECT cid, data
 								FROM eth.header_cids
 									INNER JOIN public.blocks ON (
@@ -248,11 +244,10 @@ const (
 									)
 									WHERE state_path = $1
 									AND state_cids.block_number <= $2
-									AND node_type != 3
 									AND state_cids.header_id = (SELECT canonical_header_hash(state_cids.block_number))
 									ORDER BY state_cids.block_number DESC
 									LIMIT 1`
-	RetrieveStorageByStateLeafKeyAndPathAndBlockNumberPgStr = `SELECT storage_cids.cid, data, storage_cids.node_type
+	RetrieveStorageByStateLeafKeyAndPathAndBlockNumberPgStr = `SELECT storage_cids.cid, data, storage_cids.node_type, storage_cids.block_number
 									FROM eth.storage_cids
 									INNER JOIN eth.state_cids ON (
 										storage_cids.state_path = state_cids.state_path
@@ -266,7 +261,6 @@ const (
 									WHERE state_leaf_key = $1
 									AND storage_path = $2
 									AND storage_cids.block_number <= $3
-									AND node_type != 3
 									AND storage_cids.header_id = (SELECT canonical_header_hash(storage_cids.block_number))
 									ORDER BY storage_cids.block_number DESC
 									LIMIT 1`
@@ -643,7 +637,7 @@ func (r *IPLDRetriever) RetrieveAccountByAddressAndBlockHash(address common.Addr
 		return "", nil, err
 	}
 
-	if accountResult.NodeType == removedNode {
+	if accountResult.NodeType == sdtypes.Removed.Int() {
 		return "", EmptyNodeValue, nil
 	}
 
@@ -675,7 +669,7 @@ func (r *IPLDRetriever) RetrieveAccountByAddressAndBlockNumber(address common.Ad
 		return "", nil, err
 	}
 
-	if accountResult.NodeType == removedNode {
+	if accountResult.NodeType == sdtypes.Removed.Int() {
 		return "", EmptyNodeValue, nil
 	}
 
@@ -703,7 +697,7 @@ func (r *IPLDRetriever) RetrieveStorageAtByAddressAndStorageSlotAndBlockHash(add
 	if err := r.db.Get(storageResult, RetrieveStorageLeafByAddressHashAndLeafKeyAndBlockHashPgStr, stateLeafKey.Hex(), storageHash.Hex(), hash.Hex()); err != nil {
 		return "", nil, nil, err
 	}
-	if storageResult.StateLeafRemoved || storageResult.NodeType == removedNode {
+	if storageResult.StateLeafRemoved || storageResult.NodeType == sdtypes.Removed.Int() {
 		return "", EmptyNodeValue, EmptyNodeValue, nil
 	}
 
@@ -736,7 +730,7 @@ func (r *IPLDRetriever) RetrieveStorageAtByAddressAndStorageKeyAndBlockNumber(ad
 		return "", nil, err
 	}
 
-	if storageResult.StateLeafRemoved || storageResult.NodeType == removedNode {
+	if storageResult.StateLeafRemoved || storageResult.NodeType == sdtypes.Removed.Int() {
 		return "", EmptyNodeValue, nil
 	}
 
@@ -771,7 +765,7 @@ func (r *IPLDRetriever) RetrieveStatesByPathsAndBlockNumber(tx *sqlx.Tx, paths [
 		// Create a result object, select: cid, data, node_type
 		res := new(nodeInfo)
 		if err := tx.Get(res, RetrieveStateByPathAndBlockNumberPgStr, path, number); err != nil {
-			// we will not find a node for each path
+			// Skip if node not found for a path
 			if err == sql.ErrNoRows {
 				continue
 			}
@@ -779,6 +773,11 @@ func (r *IPLDRetriever) RetrieveStatesByPathsAndBlockNumber(tx *sqlx.Tx, paths [
 			return nil, nil, nil, nil, 0, err
 		}
 
+		// Skip if node is of removed type
+		if res.NodeType == sdtypes.Removed.Int() {
+			continue
+		}
+
 		pathLen := len(path)
 		if pathLen > deepestPath {
 			deepestPath = pathLen
@@ -790,9 +789,11 @@ func (r *IPLDRetriever) RetrieveStatesByPathsAndBlockNumber(tx *sqlx.Tx, paths [
 		}
 
 		if res.NodeType == sdtypes.Leaf.Int() {
+			fmt.Println("found leaf node for path", path, res.BlockNumber)
 			leafNodeCIDs = append(leafNodeCIDs, cid)
 			leafNodeIPLDs = append(leafNodeIPLDs, res.Data)
 		} else {
+			fmt.Println("found intermediate node for path", path, res.NodeType, res.BlockNumber)
 			intermediateNodeCIDs = append(intermediateNodeCIDs, cid)
 			intermediateNodeIPLDs = append(intermediateNodeIPLDs, res.Data)
 		}
@@ -816,7 +817,7 @@ func (r *IPLDRetriever) RetrieveStorageByStateLeafKeyAndPathsAndBlockNumber(tx *
 		// Create a result object, select: cid, data, node_type
 		res := new(nodeInfo)
 		if err := tx.Get(res, RetrieveStorageByStateLeafKeyAndPathAndBlockNumberPgStr, stateLeafKey, path, number); err != nil {
-			// we will not find a node for each path
+			// Skip if node not found for a path
 			if err == sql.ErrNoRows {
 				continue
 			}
@@ -824,6 +825,11 @@ func (r *IPLDRetriever) RetrieveStorageByStateLeafKeyAndPathsAndBlockNumber(tx *
 			return nil, nil, nil, nil, 0, err
 		}
 
+		// Skip if node is of removed type
+		if res.NodeType == sdtypes.Removed.Int() {
+			continue
+		}
+
 		pathLen := len(path)
 		if pathLen > deepestPath {
 			deepestPath = pathLen
@@ -835,9 +841,11 @@ func (r *IPLDRetriever) RetrieveStorageByStateLeafKeyAndPathsAndBlockNumber(tx *
 		}
 
 		if res.NodeType == sdtypes.Leaf.Int() {
+			fmt.Println("found leaf node for path", path, res.BlockNumber)
 			leafNodeCIDs = append(leafNodeCIDs, cid)
 			leafNodeIPLDs = append(leafNodeIPLDs, res.Data)
 		} else {
+			fmt.Println("found intermediate node for path", path, res.NodeType, res.BlockNumber)
 			intermediateNodeCIDs = append(intermediateNodeCIDs, cid)
 			intermediateNodeIPLDs = append(intermediateNodeIPLDs, res.Data)
 		}