AVALANCHE: cleanup acci2.h