Some code cleanup in CalendarComposite