AVALANCHE: Remove references to removed variables.