Some cleanup to prevent read-reading the file
Calculate years during read