[fold] cleanup