AVALANCHE: Rework animation init/remove some more