ALSA: AACI cleanup