Clean up CalendarController