Ontology cleanup changes.