Removed data array; redundant data store