Checkpoint before completely removing ArchetypeTerminology
Cleaning up ObjectConstraint, enumeration and Terminology areas -- checkpoint