adding back clear_datastore from git merge