removed Datastore timeout code