WM: Dataset folders cleanup