chore(evm): code cleanup, unused code, typos, styles, warnings (#1962)

chore(evm): code cleanup, unused code, typos, styles, warnings (#1962) #163