stop using CalendarDate and Date