CLEANUP: Removed reliance on RDF datasets.