Ben/calendar cleanup