Persistence spring cleaning