Removed unneeded data store