Adding datastore indexes
removing dead comments