cleaning up the calendar more