Fixed more Unneeded calendar calls