This time with less file removal