diff --git a/P5/Exemplars/tei_jtei.odd b/P5/Exemplars/tei_jtei.odd
index 8b6cc05f9b..4236cb1c8c 100644
--- a/P5/Exemplars/tei_jtei.odd
+++ b/P5/Exemplars/tei_jtei.odd
@@ -1948,14 +1948,12 @@
             <attList>
               <attDef ident="notAfter" mode="delete"/>
               <attDef ident="role" mode="delete"/>
-              <attDef ident="calendar" mode="delete"/> <!-- remove 2024-11-11 when @calender removed from <affliation> -->
             </attList>
           </elementSpec>
           <elementSpec ident="application" mode="change">
             <attList>
               <attDef ident="type" mode="delete"/>
               <attDef ident="notAfter" mode="delete"/>
-              <attDef ident="calendar" mode="delete"/> <!-- remove 2024-11-11 when @calender removed from <application> -->
             </attList>
           </elementSpec>
           <elementSpec ident="att" module="tagdocs" mode="change">
@@ -1996,26 +1994,6 @@
               <attDef ident="group" mode="delete"/>
             </attList>
           </classSpec>
-	  <!--
-	      start @calendar removal section
-	      This whole block should be removed along with the
-	      2024-11-11 removal of @calendar from individual TEI
-	      elements. Note that elements that have @calendar deleted
-	      elsewhere in this ODD have been commented out here, and
-	      those @calendars need to be removed wherever they are
-	      declared in this ODD, too.  —Syd, 2023-10-16
-	  -->
-	  <!-- elementSpec ident="affiliation" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec -->
-	  <!-- elementSpec ident="application" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec -->
-	  <!-- elementSpec ident="author" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec -->
-	  <elementSpec ident="change" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
-	  <!-- elementSpec ident="editor" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec -->
-	  <!-- elementSpec ident="idno" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec -->
-	  <elementSpec ident="licence" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
-	  <!-- elementSpec ident="name" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec -->
-	  <!-- elementSpec ident="orgName" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec -->
-	  <elementSpec ident="resp" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
-	  <!-- end @calendar removal block -->
           <classSpec ident="att.datable" module="tei" type="atts" mode="change">
             <attList>
               <attDef ident="period" mode="delete"/>
@@ -2165,7 +2143,6 @@
             </constraintSpec>
             <attList>
               <attDef ident="role" mode="delete"/>
-              <attDef ident="calendar" mode="delete"/> <!-- remove 2024-11-11 when @calender removed from <author> -->
             </attList>
           </elementSpec>
           <elementSpec ident="availability" mode="change">
@@ -2397,7 +2374,6 @@
                   <valItem ident="technical"/>
                 </valList>
               </attDef>
-              <attDef ident="calendar" mode="delete"/> <!-- remove 2024-11-11 when @calender removed from <editor> -->
             </attList>
           </elementSpec>
           <elementSpec ident="emph" module="core" mode="change">
@@ -2574,7 +2550,6 @@
               <attDef ident="role" mode="delete"/>
               <attDef ident="notAfter" mode="delete"/>
               <attDef ident="type" mode="delete"/>
-              <attDef ident="calendar" mode="delete"/> <!-- remove 2024-11-11 when @calender removed from <name> -->
             </attList>
           </elementSpec>
           <elementSpec ident="note" mode="change">
@@ -2722,7 +2697,6 @@
               <attDef ident="notAfter" mode="delete"/>
               <attDef ident="role" mode="delete"/>
               <attDef ident="type" mode="delete"/>
-              <attDef ident="calendar" mode="delete"/> <!-- remove 2024-11-11 when @calender removed from <orgName> -->
             </attList>
           </elementSpec>
           <elementSpec ident="pubPlace" mode="change">
@@ -3124,9 +3098,6 @@
                 </sch:rule>
               </constraint>
             </constraintSpec>
-	    <attList> <!-- remove 2024-11-11 when @calender removed from <idno> -->
-              <attDef ident="calendar" mode="delete"/> <!-- remove 2024-11-11 when @calender removed from <idno> -->
-	    </attList> <!-- remove 2024-11-11 when @calender removed from <idno> -->
           </elementSpec>
           <elementSpec ident="graphic" module="core" mode="change">
             <constraintSpec ident="jtei.sch-graphic-dimensions" scheme="schematron" xml:lang="en">
diff --git a/P5/Exemplars/tei_lite.odd b/P5/Exemplars/tei_lite.odd
index 1149ac38a6..aaffecacb7 100644
--- a/P5/Exemplars/tei_lite.odd
+++ b/P5/Exemplars/tei_lite.odd
@@ -2952,25 +2952,6 @@ $Id$
               <attDef ident="to" mode="delete"/>
             </attList>
           </classSpec>
-	  <!--
-	      start @calendar removal section
-	      This whole block should be removed along with the
-	      2024-11-11 removal of @calendar from individual TEI
-	      elements.  —Syd, 2023-10-16
-	  -->
-	  <elementSpec ident="author" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
-	  <elementSpec ident="change" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
-	  <elementSpec ident="creation" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
-	  <elementSpec ident="editor" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
-	  <elementSpec ident="funder" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
-	  <elementSpec ident="idno" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
-	  <elementSpec ident="licence" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
-	  <elementSpec ident="name" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
-	  <elementSpec ident="principal" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
-	  <elementSpec ident="resp" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
-	  <elementSpec ident="sponsor" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
-	  <elementSpec ident="title" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
-	  <!-- end @calendar removal block -->
           <classSpec type="atts"
                      ident="att.internetMedia"
                      module="tei"
diff --git a/P5/Exemplars/tei_tite.odd b/P5/Exemplars/tei_tite.odd
index f630a50092..1180cab6d1 100644
--- a/P5/Exemplars/tei_tite.odd
+++ b/P5/Exemplars/tei_tite.odd
@@ -923,9 +923,15 @@ some say, "No."
      <!-- delete assorted attributes -->
 
      <elementSpec ident="date" mode="change" module="core">
-      <attList>
-       <attDef ident="calendar" mode="delete"/>
-      </attList>
+      <classes mode="change">
+        <memberOf key="att.global"/>
+        <!-- <memberOf key="att.calendarSystem"/> -->
+        <memberOf key="att.datable"/>
+        <memberOf key="att.editLike"/>
+        <memberOf key="att.typed"/>
+        <memberOf key="model.dateLike"/>
+        <memberOf key="model.publicationStmtPart.detail"/>
+      </classes>
      </elementSpec>
 
      <elementSpec ident="time" mode="change" module="core">