remove some debugging and skip folds