SPARQL clean-up