Update 311 and clean Ontology