diff --git a/productMods/templates/freemarker/body/menupage/testMenuEdit.ftl b/productMods/templates/freemarker/body/menupage/testMenuEdit.ftl
deleted file mode 100644
index e4a24d6a..00000000
--- a/productMods/templates/freemarker/body/menupage/testMenuEdit.ftl
+++ /dev/null
@@ -1,27 +0,0 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<#-- 
-Menu Edit Form
-Associated with generator:
-edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.MenuEditingFormGenerator
--->
-
-
-
-<h2>${editConfiguration.formTitle}</h2>
-<#assign pageTitle = editConfiguration.literalValues["title"].getString() />
-<form class="editForm" action = "${editConfiguration.submitToUrl}">
-	
-	<input name="title" id="title" value="${pageTitle}">
-	
-	
-	<input type="hidden" name="editKey" value="${editConfiguration.editKey}" />
-	
-	<div style="margin-top: 0.2em">
-		<input type="submit" value="${editConfiguration.submitLabel}" />
-	</div>
-	
-</form>
-
-
-<@dumpAll/>
\ No newline at end of file
diff --git a/rdf/tbox/filegraph/data-properties.owl b/rdf/tbox/filegraph/data-properties.owl
index b7eaf46e..4655c000 100644
--- a/rdf/tbox/filegraph/data-properties.owl
+++ b/rdf/tbox/filegraph/data-properties.owl
@@ -1621,15 +1621,6 @@ modern society using the world of Star trek. Los Angeles Times, March
     
 
 
-    <!-- http://purl.org/spar/c4o/hasGlobalCountDate -->
-
-    <owl:DatatypeProperty rdf:about="http://purl.org/spar/c4o/hasGlobalCountDate">
-
-        <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">The date on which the global citation count of the cited entity was recorded from a named bibliographic information source.</obo:IAO_0000115>
-    </owl:DatatypeProperty>
-    
-
-
     <!-- http://purl.org/spar/c4o/hasGlobalCountValue -->
 
     <owl:DatatypeProperty rdf:about="http://purl.org/spar/c4o/hasGlobalCountValue">
@@ -1668,15 +1659,6 @@ modern society using the world of Star trek. Los Angeles Times, March
     
 
 
-    <!-- http://vivoweb.org/ontology/core#dateTime -->
-
-    <owl:DatatypeProperty rdf:about="http://vivoweb.org/ontology/core#dateTime">
-
-        <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#dateTime"/>
-    </owl:DatatypeProperty>
-    
-
-
     <!-- http://vivoweb.org/ontology/core#eRACommonsId -->
 
     <owl:DatatypeProperty rdf:about="http://vivoweb.org/ontology/core#eRACommonsId">
diff --git a/rdf/tbox/filegraph/object-properties.owl b/rdf/tbox/filegraph/object-properties.owl
index bd028855..2f935ace 100644
--- a/rdf/tbox/filegraph/object-properties.owl
+++ b/rdf/tbox/filegraph/object-properties.owl
@@ -1264,6 +1264,15 @@ there is a measurement process p that has specified output m, a measurement datu
     </owl:ObjectProperty>
     
 
+    <!-- http://vivoweb.org/ontology/core#dateTime -->
+
+    <owl:ObjectProperty rdf:about="http://vivoweb.org/ontology/core#dateTime">
+
+        <rdfs:range rdf:resource="http://vivoweb.org/ontology/core#DateTimeValue"/>
+        <rdfs:subPropertyOf rdf:resource="http://vivoweb.org/ontology/core#dateTimeValue"/>
+    </owl:ObjectProperty>
+    
+
 
     <!-- http://vivoweb.org/ontology/core#dateFiled -->
 
@@ -1276,6 +1285,18 @@ there is a measurement process p that has specified output m, a measurement datu
     
 
 
+    <!-- http://purl.org/spar/c4o/hasGlobalCountDate -->
+
+    <owl:ObjectProperty rdf:about="http://purl.org/spar/c4o/hasGlobalCountDate">
+
+        <rdfs:domain rdf:resource="http://purl.org/spar/c4o/GlobalCitationCount"/>
+        <rdfs:range rdf:resource="http://vivoweb.org/ontology/core#DateTimeValue"/>
+        <rdfs:subPropertyOf rdf:resource="http://vivoweb.org/ontology/core#dateTimeValue"/>
+        <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">The date on which the global citation count of the cited entity was recorded from a named bibliographic information source.</obo:IAO_0000115>
+    </owl:ObjectProperty>
+    
+
+
     <!-- http://vivoweb.org/ontology/core#dateIssued -->
 
     <owl:ObjectProperty rdf:about="http://vivoweb.org/ontology/core#dateIssued">
diff --git a/rdf/tbox/filegraph/object-properties3.owl b/rdf/tbox/filegraph/object-properties3.owl
index 8de53c94..faaa8265 100644
--- a/rdf/tbox/filegraph/object-properties3.owl
+++ b/rdf/tbox/filegraph/object-properties3.owl
@@ -752,17 +752,6 @@
     
 
 
-    <!-- http://purl.org/spar/c4o/hasGlobalCountDate -->
-
-    <owl:DatatypeProperty rdf:about="http://purl.org/spar/c4o/hasGlobalCountDate">
-
-        <vitro:descriptionAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">The date on which the global citation count of the cited entity was recorded from a named bibliographic information source.</vitro:descriptionAnnot>
-        <rdfs:domain rdf:resource="http://purl.org/spar/c4o/GlobalCitationCount"/>
-        <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#date"/>
-    </owl:DatatypeProperty>
-    
-
-
     <!-- http://purl.org/spar/c4o/hasGlobalCountValue -->
 
     <owl:DatatypeProperty rdf:about="http://purl.org/spar/c4o/hasGlobalCountValue">
diff --git a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 b/rdf/tbox/firsttime/initialTBoxAnnotations.n3
index fdc05654..312850e6 100644
--- a/rdf/tbox/firsttime/initialTBoxAnnotations.n3
+++ b/rdf/tbox/firsttime/initialTBoxAnnotations.n3
@@ -5124,6 +5124,8 @@ bibo:Interview
 
 <http://purl.org/spar/c4o/hasGlobalCountDate>
       rdfs:label "has global count date"@en-US ;
+      vitro:customEntryFormAnnot
+              "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.DateTimePropertyGenerator"^^xsd:string ;
       vitro:displayLimitAnnot
               "5"^^xsd:int ;
       vitro:displayRankAnnot
@@ -7663,6 +7665,8 @@ vcard:OrganizationUnitName
 
 vivo:dateTime
       rdfs:label "date/time"@en-US , "date/time"@en-US ;
+      vitro:customEntryFormAnnot
+              "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.DateTimePropertyGenerator"^^xsd:string ;
       vitro:displayLimitAnnot
               "5"^^xsd:int ;
       vitro:displayRankAnnot