More cleaning of calendar