[FOLD] cleanup