[wallace] small touches to calendar cleanup