Accordion: cleanup