Get rid of silly CalendarEntry type