Major cleanup of last year's files