Remove AAC cruft for now.