Ecore metamodels cleanup