Avoiding stubbs now
Ontology clean up