Removed deprecated register in Trie and Math swap