AVALANCHE: Change some variable's type, remove unused function.