Calendar cleanup