Remove incomplete datastore stuff for the time being