AVALANCHE: Remove some useless/dead code