AVALANCHE: Remove various dead variables and associated code