diff --git a/Schemas/Bulk/Ed-Fi-Core.xsd b/Schemas/Bulk/Ed-Fi-Core.xsd
index c8fd58b..e38a750 100644
--- a/Schemas/Bulk/Ed-Fi-Core.xsd
+++ b/Schemas/Bulk/Ed-Fi-Core.xsd
@@ -3498,7 +3498,7 @@
           </xs:element>
           <xs:element name="ProgramEvaluationObjectiveDescription" type="ProgramEvaluationDescription" minOccurs="0">
             <xs:annotation>
-              <xs:documentation>	The long description of the program evaluation objective.</xs:documentation>
+              <xs:documentation>The long description of the program evaluation objective.</xs:documentation>
             </xs:annotation>
           </xs:element>
           <xs:element name="ObjectiveRatingLevel" type="Level" minOccurs="0" maxOccurs="unbounded">
diff --git a/Schemas/Bulk/Interchange-Descriptors.xsd b/Schemas/Bulk/Interchange-Descriptors.xsd
index d8a2355..dc625a0 100644
--- a/Schemas/Bulk/Interchange-Descriptors.xsd
+++ b/Schemas/Bulk/Interchange-Descriptors.xsd
@@ -84,8 +84,6 @@ The Descriptor interchange is used to describe metadata about the descriptors an
         <xs:element name="EntryGradeLevelReasonDescriptor" type="EntryGradeLevelReasonDescriptor" />
         <xs:element name="EntryTypeDescriptor" type="EntryTypeDescriptor" />
         <xs:element name="EvaluationDelayReasonDescriptor" type="EvaluationDelayReasonDescriptor" />
-        <xs:element name="ProgramEvaluationPeriodDescriptor" type="ProgramEvaluationPeriodDescriptor" />
-        <xs:element name="ProgramEvaluationTypeDescriptor" type="ProgramEvaluationTypeDescriptor" />
         <xs:element name="EventCircumstanceDescriptor" type="EventCircumstanceDescriptor" />
         <xs:element name="ExitWithdrawTypeDescriptor" type="ExitWithdrawTypeDescriptor" />
         <xs:element name="FinancialCollectionDescriptor" type="FinancialCollectionDescriptor" />
@@ -150,6 +148,8 @@ The Descriptor interchange is used to describe metadata about the descriptors an
         <xs:element name="ProficiencyDescriptor" type="ProficiencyDescriptor" />
         <xs:element name="ProgramAssignmentDescriptor" type="ProgramAssignmentDescriptor" />
         <xs:element name="ProgramCharacteristicDescriptor" type="ProgramCharacteristicDescriptor" />
+        <xs:element name="ProgramEvaluationPeriodDescriptor" type="ProgramEvaluationPeriodDescriptor" />
+        <xs:element name="ProgramEvaluationTypeDescriptor" type="ProgramEvaluationTypeDescriptor" />
         <xs:element name="ProgramSponsorDescriptor" type="ProgramSponsorDescriptor" />
         <xs:element name="ProgramTypeDescriptor" type="ProgramTypeDescriptor" />
         <xs:element name="ProgressDescriptor" type="ProgressDescriptor" />
diff --git a/Schemas/Bulk/SchemaAnnotation.xsd b/Schemas/Bulk/SchemaAnnotation.xsd
index cc299d6..1da12e0 100644
--- a/Schemas/Bulk/SchemaAnnotation.xsd
+++ b/Schemas/Bulk/SchemaAnnotation.xsd
@@ -20,13 +20,11 @@
       <xs:enumeration value="AcademicSubjectDescriptor" />
       <xs:enumeration value="AccommodationDescriptor" />
       <xs:enumeration value="AccountTypeDescriptor" />
-      <xs:enumeration value="AccreditationStatusDescriptor" />
       <xs:enumeration value="AchievementCategoryDescriptor" />
       <xs:enumeration value="AdditionalCreditTypeDescriptor" />
       <xs:enumeration value="AddressTypeDescriptor" />
       <xs:enumeration value="AdministrationEnvironmentDescriptor" />
       <xs:enumeration value="AdministrativeFundingControlDescriptor" />
-      <xs:enumeration value="AidTypeDescriptor" />
       <xs:enumeration value="AncestryEthnicOriginDescriptor" />
       <xs:enumeration value="AssessmentCategoryDescriptor" />
       <xs:enumeration value="AssessmentIdentificationSystemDescriptor" />
@@ -42,7 +40,6 @@
       <xs:enumeration value="CalendarEventDescriptor" />
       <xs:enumeration value="CalendarTypeDescriptor" />
       <xs:enumeration value="CareerPathwayDescriptor" />
-      <xs:enumeration value="CertificationRouteDescriptor" />
       <xs:enumeration value="CharterApprovalAgencyTypeDescriptor" />
       <xs:enumeration value="CharterStatusDescriptor" />
       <xs:enumeration value="CitizenshipStatusDescriptor" />
@@ -55,7 +52,6 @@
       <xs:enumeration value="ContentClassDescriptor" />
       <xs:enumeration value="ContinuationOfServicesReasonDescriptor" />
       <xs:enumeration value="CostRateDescriptor" />
-      <xs:enumeration value="CoteachingStyleObservedDescriptor" />
       <xs:enumeration value="CountryDescriptor" />
       <xs:enumeration value="CourseAttemptResultDescriptor" />
       <xs:enumeration value="CourseDefinedByDescriptor" />
@@ -64,7 +60,6 @@
       <xs:enumeration value="CourseLevelCharacteristicDescriptor" />
       <xs:enumeration value="CourseRepeatCodeDescriptor" />
       <xs:enumeration value="CredentialFieldDescriptor" />
-      <xs:enumeration value="CredentialStatusDescriptor" />
       <xs:enumeration value="CredentialTypeDescriptor" />
       <xs:enumeration value="CreditCategoryDescriptor" />
       <xs:enumeration value="CreditTypeDescriptor" />
@@ -85,26 +80,17 @@
       <xs:enumeration value="EducationOrganizationCategoryDescriptor" />
       <xs:enumeration value="EducationOrganizationIdentificationSystemDescriptor" />
       <xs:enumeration value="EducationPlanDescriptor" />
-      <xs:enumeration value="EducatorRoleDescriptor" />
       <xs:enumeration value="ElectronicMailTypeDescriptor" />
       <xs:enumeration value="EligibilityDelayReasonDescriptor" />
       <xs:enumeration value="EligibilityEvaluationTypeDescriptor" />
       <xs:enumeration value="EmploymentStatusDescriptor" />
-      <xs:enumeration value="EnglishLanguageExamDescriptor" />
       <xs:enumeration value="EnrollmentTypeDescriptor" />
       <xs:enumeration value="EntryGradeLevelReasonDescriptor" />
       <xs:enumeration value="EntryTypeDescriptor" />
-      <xs:enumeration value="EPPProgramPathwayDescriptor" />
       <xs:enumeration value="EvaluationDelayReasonDescriptor" />
-      <xs:enumeration value="EvaluationElementRatingLevelDescriptor" />
-      <xs:enumeration value="EvaluationPeriodDescriptor" />
-      <xs:enumeration value="EvaluationRatingLevelDescriptor" />
-      <xs:enumeration value="EvaluationRatingStatusDescriptor" />
-      <xs:enumeration value="EvaluationTypeDescriptor" />
       <xs:enumeration value="EventCircumstanceDescriptor" />
       <xs:enumeration value="ExitWithdrawTypeDescriptor" />
       <xs:enumeration value="FinancialCollectionDescriptor" />
-      <xs:enumeration value="GenderDescriptor" />
       <xs:enumeration value="GradebookEntryTypeDescriptor" />
       <xs:enumeration value="GradeLevelDescriptor" />
       <xs:enumeration value="GradePointAverageTypeDescriptor" />
@@ -148,14 +134,11 @@
       <xs:enumeration value="NeglectedOrDelinquentProgramDescriptor" />
       <xs:enumeration value="NeglectedOrDelinquentProgramServiceDescriptor" />
       <xs:enumeration value="NetworkPurposeDescriptor" />
-      <xs:enumeration value="ObjectiveRatingLevelDescriptor" />
       <xs:enumeration value="OperationalStatusDescriptor" />
       <xs:enumeration value="OtherNameTypeDescriptor" />
       <xs:enumeration value="ParticipationDescriptor" />
       <xs:enumeration value="ParticipationStatusDescriptor" />
       <xs:enumeration value="PerformanceBaseConversionDescriptor" />
-      <xs:enumeration value="PerformanceEvaluationRatingLevelDescriptor" />
-      <xs:enumeration value="PerformanceEvaluationTypeDescriptor" />
       <xs:enumeration value="PerformanceLevelDescriptor" />
       <xs:enumeration value="PersonalInformationVerificationDescriptor" />
       <xs:enumeration value="PlatformTypeDescriptor" />
@@ -195,7 +178,6 @@
       <xs:enumeration value="RestraintEventReasonDescriptor" />
       <xs:enumeration value="ResultDatatypeTypeDescriptor" />
       <xs:enumeration value="RetestIndicatorDescriptor" />
-      <xs:enumeration value="RubricRatingLevelDescriptor" />
       <xs:enumeration value="SchoolCategoryDescriptor" />
       <xs:enumeration value="SchoolChoiceBasisDescriptor" />
       <xs:enumeration value="SchoolChoiceImplementStatusDescriptor" />