UI-2961: [CALENDAR] - Clean up OLD resources - bugs