GCP-6139 Sorting + OntologyService cleanup