Speeded up data cleanup