Fixed unneeded calendar calls