Fold cleanup