So we should just remove the if statements on checking OntologyLink, correct?