-*-aai-*- cleanup