more cleaning datastore now out of repo