New folders should clean up old ones first