AVALANCHE: Various cleanup