AVALANCHE: Remove some dead/useless code