AVALANCHE: Remove useless variable, move variables to dialogs