Just as a reminder, `Securetire` is renamed as StateTrie in this PR https://github.com/ethereum/go-ethereum/pull/25458. If you need to tidy up the Trie part later, you can probably follow the latest code base.