Removed cluster, added bib datastore and dataset