cleanup
Depend on own rdfstore due to bug
Fixes to study interface