Removed now-redundant Datastore