Clean up datastore entities

Clean up datastore entities