#1282 Removed datastore-indexes