** Removed deprecated calendar entities