Merge pull request #163 from lowjoel/reduce-datastore-dependencies
Remove the data store dependencies.

(main@536eb4806aa8600e82df6a0793ab412948325ffe)