Folding clean-up