Removed TEDate and TEYear as they are replaced by TEIs.Year and TEIs.Date