AVALANCHE: Comment out some dead code