Bug fix where old folders were not cleaned up