old calendar cleanup - complete fix #67