I think we can get rid of the conditional before merging. I don't see any reason to keep both, especially since the idea is to ditch sparql anyway.