Remove the data store dependencies.

@digawp