remove dependency on CMFCalendar