Included Year fields in the removal of empty rows