Final cleanup on ReferenceModel and Terminology profile