diff --git a/src/cmd/services/m3dbnode/config/bootstrap.go b/src/cmd/services/m3dbnode/config/bootstrap.go
index 354791c3d9..bf9782609e 100644
--- a/src/cmd/services/m3dbnode/config/bootstrap.go
+++ b/src/cmd/services/m3dbnode/config/bootstrap.go
@@ -53,9 +53,6 @@ type BootstrapConfiguration struct {
 	// Filesystem bootstrapper configuration.
 	Filesystem *BootstrapFilesystemConfiguration `yaml:"fs"`
 
-	// Peers bootstrapper configuration.
-	Peers *BootstrapPeersConfiguration `yaml:"peers"`
-
 	// Commitlog bootstrapper configuration.
 	Commitlog *BootstrapCommitlogConfiguration `yaml:"commitlog"`
 
@@ -72,28 +69,12 @@ func (bsc BootstrapConfiguration) fsNumProcessors() int {
 	return int(math.Ceil(float64(runtime.NumCPU()) * np))
 }
 
-// TODO: Remove once v1 endpoint no longer required.
-func (bsc BootstrapConfiguration) peersFetchBlocksMetadataEndpointVersion() client.FetchBlocksMetadataEndpointVersion {
-	version := client.FetchBlocksMetadataEndpointDefault
-	if peersCfg := bsc.Peers; peersCfg != nil {
-		version = peersCfg.FetchBlocksMetadataEndpointVersion
-	}
-	return version
-}
-
 // BootstrapFilesystemConfiguration specifies config for the fs bootstrapper.
 type BootstrapFilesystemConfiguration struct {
 	// NumProcessorsPerCPU is the number of processors per CPU.
 	NumProcessorsPerCPU float64 `yaml:"numProcessorsPerCPU" validate:"min=0.0"`
 }
 
-// BootstrapPeersConfiguration specifies config for the peers bootstrapper.
-type BootstrapPeersConfiguration struct {
-	// FetchBlocksMetadataEndpointVersion is the endpoint to use when fetching blocks metadata.
-	// TODO: Remove once v1 endpoint no longer required.
-	FetchBlocksMetadataEndpointVersion client.FetchBlocksMetadataEndpointVersion `yaml:"fetchBlocksMetadataEndpointVersion"`
-}
-
 // BootstrapCommitlogConfiguration specifies config for the commitlog bootstrapper.
 type BootstrapCommitlogConfiguration struct {
 	// ReturnUnfulfilledForCorruptCommitlogFiles controls whether the commitlog bootstrapper
@@ -171,7 +152,6 @@ func (bsc BootstrapConfiguration) New(
 				SetAdminClient(adminClient).
 				SetPersistManager(opts.PersistManager()).
 				SetDatabaseBlockRetrieverManager(opts.DatabaseBlockRetrieverManager()).
-				SetFetchBlocksMetadataEndpointVersion(bsc.peersFetchBlocksMetadataEndpointVersion()).
 				SetRuntimeOptionsManager(opts.RuntimeOptionsManager())
 			bs, err = peers.NewPeersBootstrapperProvider(pOpts, bs)
 			if err != nil {
diff --git a/src/dbnode/client/client_mock.go b/src/dbnode/client/client_mock.go
index 180b6e00a3..27e5c8f5e1 100644
--- a/src/dbnode/client/client_mock.go
+++ b/src/dbnode/client/client_mock.go
@@ -742,42 +742,42 @@ func (mr *MockAdminSessionMockRecorder) Truncate(namespace interface{}) *gomock.
 }
 
 // FetchBootstrapBlocksFromPeers mocks base method
-func (m *MockAdminSession) FetchBootstrapBlocksFromPeers(namespace namespace.Metadata, shard uint32, start, end time.Time, opts result.Options, version FetchBlocksMetadataEndpointVersion) (result.ShardResult, error) {
-	ret := m.ctrl.Call(m, "FetchBootstrapBlocksFromPeers", namespace, shard, start, end, opts, version)
+func (m *MockAdminSession) FetchBootstrapBlocksFromPeers(namespace namespace.Metadata, shard uint32, start, end time.Time, opts result.Options) (result.ShardResult, error) {
+	ret := m.ctrl.Call(m, "FetchBootstrapBlocksFromPeers", namespace, shard, start, end, opts)
 	ret0, _ := ret[0].(result.ShardResult)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // FetchBootstrapBlocksFromPeers indicates an expected call of FetchBootstrapBlocksFromPeers
-func (mr *MockAdminSessionMockRecorder) FetchBootstrapBlocksFromPeers(namespace, shard, start, end, opts, version interface{}) *gomock.Call {
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FetchBootstrapBlocksFromPeers", reflect.TypeOf((*MockAdminSession)(nil).FetchBootstrapBlocksFromPeers), namespace, shard, start, end, opts, version)
+func (mr *MockAdminSessionMockRecorder) FetchBootstrapBlocksFromPeers(namespace, shard, start, end, opts interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FetchBootstrapBlocksFromPeers", reflect.TypeOf((*MockAdminSession)(nil).FetchBootstrapBlocksFromPeers), namespace, shard, start, end, opts)
 }
 
 // FetchBootstrapBlocksMetadataFromPeers mocks base method
-func (m *MockAdminSession) FetchBootstrapBlocksMetadataFromPeers(namespace ident.ID, shard uint32, start, end time.Time, result result.Options, version FetchBlocksMetadataEndpointVersion) (PeerBlockMetadataIter, error) {
-	ret := m.ctrl.Call(m, "FetchBootstrapBlocksMetadataFromPeers", namespace, shard, start, end, result, version)
+func (m *MockAdminSession) FetchBootstrapBlocksMetadataFromPeers(namespace ident.ID, shard uint32, start, end time.Time, result result.Options) (PeerBlockMetadataIter, error) {
+	ret := m.ctrl.Call(m, "FetchBootstrapBlocksMetadataFromPeers", namespace, shard, start, end, result)
 	ret0, _ := ret[0].(PeerBlockMetadataIter)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // FetchBootstrapBlocksMetadataFromPeers indicates an expected call of FetchBootstrapBlocksMetadataFromPeers
-func (mr *MockAdminSessionMockRecorder) FetchBootstrapBlocksMetadataFromPeers(namespace, shard, start, end, result, version interface{}) *gomock.Call {
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FetchBootstrapBlocksMetadataFromPeers", reflect.TypeOf((*MockAdminSession)(nil).FetchBootstrapBlocksMetadataFromPeers), namespace, shard, start, end, result, version)
+func (mr *MockAdminSessionMockRecorder) FetchBootstrapBlocksMetadataFromPeers(namespace, shard, start, end, result interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FetchBootstrapBlocksMetadataFromPeers", reflect.TypeOf((*MockAdminSession)(nil).FetchBootstrapBlocksMetadataFromPeers), namespace, shard, start, end, result)
 }
 
 // FetchBlocksMetadataFromPeers mocks base method
-func (m *MockAdminSession) FetchBlocksMetadataFromPeers(namespace ident.ID, shard uint32, start, end time.Time, consistencyLevel topology.ReadConsistencyLevel, result result.Options, version FetchBlocksMetadataEndpointVersion) (PeerBlockMetadataIter, error) {
-	ret := m.ctrl.Call(m, "FetchBlocksMetadataFromPeers", namespace, shard, start, end, consistencyLevel, result, version)
+func (m *MockAdminSession) FetchBlocksMetadataFromPeers(namespace ident.ID, shard uint32, start, end time.Time, consistencyLevel topology.ReadConsistencyLevel, result result.Options) (PeerBlockMetadataIter, error) {
+	ret := m.ctrl.Call(m, "FetchBlocksMetadataFromPeers", namespace, shard, start, end, consistencyLevel, result)
 	ret0, _ := ret[0].(PeerBlockMetadataIter)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // FetchBlocksMetadataFromPeers indicates an expected call of FetchBlocksMetadataFromPeers
-func (mr *MockAdminSessionMockRecorder) FetchBlocksMetadataFromPeers(namespace, shard, start, end, consistencyLevel, result, version interface{}) *gomock.Call {
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FetchBlocksMetadataFromPeers", reflect.TypeOf((*MockAdminSession)(nil).FetchBlocksMetadataFromPeers), namespace, shard, start, end, consistencyLevel, result, version)
+func (mr *MockAdminSessionMockRecorder) FetchBlocksMetadataFromPeers(namespace, shard, start, end, consistencyLevel, result interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FetchBlocksMetadataFromPeers", reflect.TypeOf((*MockAdminSession)(nil).FetchBlocksMetadataFromPeers), namespace, shard, start, end, consistencyLevel, result)
 }
 
 // FetchBlocksFromPeers mocks base method
@@ -3237,42 +3237,42 @@ func (mr *MockclientSessionMockRecorder) Truncate(namespace interface{}) *gomock
 }
 
 // FetchBootstrapBlocksFromPeers mocks base method
-func (m *MockclientSession) FetchBootstrapBlocksFromPeers(namespace namespace.Metadata, shard uint32, start, end time.Time, opts result.Options, version FetchBlocksMetadataEndpointVersion) (result.ShardResult, error) {
-	ret := m.ctrl.Call(m, "FetchBootstrapBlocksFromPeers", namespace, shard, start, end, opts, version)
+func (m *MockclientSession) FetchBootstrapBlocksFromPeers(namespace namespace.Metadata, shard uint32, start, end time.Time, opts result.Options) (result.ShardResult, error) {
+	ret := m.ctrl.Call(m, "FetchBootstrapBlocksFromPeers", namespace, shard, start, end, opts)
 	ret0, _ := ret[0].(result.ShardResult)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // FetchBootstrapBlocksFromPeers indicates an expected call of FetchBootstrapBlocksFromPeers
-func (mr *MockclientSessionMockRecorder) FetchBootstrapBlocksFromPeers(namespace, shard, start, end, opts, version interface{}) *gomock.Call {
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FetchBootstrapBlocksFromPeers", reflect.TypeOf((*MockclientSession)(nil).FetchBootstrapBlocksFromPeers), namespace, shard, start, end, opts, version)
+func (mr *MockclientSessionMockRecorder) FetchBootstrapBlocksFromPeers(namespace, shard, start, end, opts interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FetchBootstrapBlocksFromPeers", reflect.TypeOf((*MockclientSession)(nil).FetchBootstrapBlocksFromPeers), namespace, shard, start, end, opts)
 }
 
 // FetchBootstrapBlocksMetadataFromPeers mocks base method
-func (m *MockclientSession) FetchBootstrapBlocksMetadataFromPeers(namespace ident.ID, shard uint32, start, end time.Time, result result.Options, version FetchBlocksMetadataEndpointVersion) (PeerBlockMetadataIter, error) {
-	ret := m.ctrl.Call(m, "FetchBootstrapBlocksMetadataFromPeers", namespace, shard, start, end, result, version)
+func (m *MockclientSession) FetchBootstrapBlocksMetadataFromPeers(namespace ident.ID, shard uint32, start, end time.Time, result result.Options) (PeerBlockMetadataIter, error) {
+	ret := m.ctrl.Call(m, "FetchBootstrapBlocksMetadataFromPeers", namespace, shard, start, end, result)
 	ret0, _ := ret[0].(PeerBlockMetadataIter)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // FetchBootstrapBlocksMetadataFromPeers indicates an expected call of FetchBootstrapBlocksMetadataFromPeers
-func (mr *MockclientSessionMockRecorder) FetchBootstrapBlocksMetadataFromPeers(namespace, shard, start, end, result, version interface{}) *gomock.Call {
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FetchBootstrapBlocksMetadataFromPeers", reflect.TypeOf((*MockclientSession)(nil).FetchBootstrapBlocksMetadataFromPeers), namespace, shard, start, end, result, version)
+func (mr *MockclientSessionMockRecorder) FetchBootstrapBlocksMetadataFromPeers(namespace, shard, start, end, result interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FetchBootstrapBlocksMetadataFromPeers", reflect.TypeOf((*MockclientSession)(nil).FetchBootstrapBlocksMetadataFromPeers), namespace, shard, start, end, result)
 }
 
 // FetchBlocksMetadataFromPeers mocks base method
-func (m *MockclientSession) FetchBlocksMetadataFromPeers(namespace ident.ID, shard uint32, start, end time.Time, consistencyLevel topology.ReadConsistencyLevel, result result.Options, version FetchBlocksMetadataEndpointVersion) (PeerBlockMetadataIter, error) {
-	ret := m.ctrl.Call(m, "FetchBlocksMetadataFromPeers", namespace, shard, start, end, consistencyLevel, result, version)
+func (m *MockclientSession) FetchBlocksMetadataFromPeers(namespace ident.ID, shard uint32, start, end time.Time, consistencyLevel topology.ReadConsistencyLevel, result result.Options) (PeerBlockMetadataIter, error) {
+	ret := m.ctrl.Call(m, "FetchBlocksMetadataFromPeers", namespace, shard, start, end, consistencyLevel, result)
 	ret0, _ := ret[0].(PeerBlockMetadataIter)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // FetchBlocksMetadataFromPeers indicates an expected call of FetchBlocksMetadataFromPeers
-func (mr *MockclientSessionMockRecorder) FetchBlocksMetadataFromPeers(namespace, shard, start, end, consistencyLevel, result, version interface{}) *gomock.Call {
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FetchBlocksMetadataFromPeers", reflect.TypeOf((*MockclientSession)(nil).FetchBlocksMetadataFromPeers), namespace, shard, start, end, consistencyLevel, result, version)
+func (mr *MockclientSessionMockRecorder) FetchBlocksMetadataFromPeers(namespace, shard, start, end, consistencyLevel, result interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FetchBlocksMetadataFromPeers", reflect.TypeOf((*MockclientSession)(nil).FetchBlocksMetadataFromPeers), namespace, shard, start, end, consistencyLevel, result)
 }
 
 // FetchBlocksFromPeers mocks base method
diff --git a/src/dbnode/client/session.go b/src/dbnode/client/session.go
index 24193c5d12..234a4f22b1 100644
--- a/src/dbnode/client/session.go
+++ b/src/dbnode/client/session.go
@@ -80,26 +80,7 @@ const (
 	resultTypeRaw                      = "raw"
 )
 
-// FetchBlocksMetadataEndpointVersion represents an endpoint version for the
-// fetch blocks metadata endpoint
-type FetchBlocksMetadataEndpointVersion int
-
-const (
-	// FetchBlocksMetadataEndpointDefault represents to use the default fetch blocks metadata endpoint
-	FetchBlocksMetadataEndpointDefault FetchBlocksMetadataEndpointVersion = iota
-	// FetchBlocksMetadataEndpointV1 represents v1 of the fetch blocks metadata endpoint
-	FetchBlocksMetadataEndpointV1
-	// FetchBlocksMetadataEndpointV2 represents v2 of the fetch blocks metadata endpoint
-	FetchBlocksMetadataEndpointV2 = FetchBlocksMetadataEndpointDefault
-)
-
 var (
-	validFetchBlocksMetadataEndpoints = []FetchBlocksMetadataEndpointVersion{
-		FetchBlocksMetadataEndpointV1,
-		FetchBlocksMetadataEndpointV2,
-	}
-	errFetchBlocksMetadataEndpointVersionUnspecified = errors.New(
-		"fetch blocks metadata endpoint version unspecified")
 	errUnknownWriteAttemptType = errors.New(
 		"unknown write attempt type specified, internal error")
 )
@@ -122,9 +103,6 @@ var (
 	errSessionInvalidConnectClusterConnectConsistencyLevel = errors.New("session has invalid connect consistency level specified")
 	// errSessionHasNoHostQueueForHost is raised when host queue requested for a missing host
 	errSessionHasNoHostQueueForHost = errors.New("session has no host queue for host")
-	// errInvalidFetchBlocksMetadataVersion is raised when an invalid fetch blocks
-	// metadata endpoint version is provided
-	errInvalidFetchBlocksMetadataVersion = errors.New("invalid fetch blocks metadata endpoint version")
 	// errUnableToEncodeTags is raised when the server is unable to encode provided tags
 	// to be sent over the wire.
 	errUnableToEncodeTags = errors.New("unable to include tags")
@@ -1707,11 +1685,10 @@ func (s *session) FetchBootstrapBlocksMetadataFromPeers(
 	shard uint32,
 	start, end time.Time,
 	resultOpts result.Options,
-	version FetchBlocksMetadataEndpointVersion,
 ) (PeerBlockMetadataIter, error) {
 	level := newSessionBootstrapRuntimeReadConsistencyLevel(s)
 	return s.fetchBlocksMetadataFromPeers(namespace,
-		shard, start, end, level, resultOpts, version)
+		shard, start, end, level, resultOpts)
 }
 
 func (s *session) FetchBlocksMetadataFromPeers(
@@ -1720,11 +1697,10 @@ func (s *session) FetchBlocksMetadataFromPeers(
 	start, end time.Time,
 	consistencyLevel topology.ReadConsistencyLevel,
 	resultOpts result.Options,
-	version FetchBlocksMetadataEndpointVersion,
 ) (PeerBlockMetadataIter, error) {
 	level := newStaticRuntimeReadConsistencyLevel(consistencyLevel)
 	return s.fetchBlocksMetadataFromPeers(namespace,
-		shard, start, end, level, resultOpts, version)
+		shard, start, end, level, resultOpts)
 }
 
 func (s *session) fetchBlocksMetadataFromPeers(
@@ -1733,7 +1709,6 @@ func (s *session) fetchBlocksMetadataFromPeers(
 	start, end time.Time,
 	level runtimeReadConsistencyLevel,
 	resultOpts result.Options,
-	version FetchBlocksMetadataEndpointVersion,
 ) (PeerBlockMetadataIter, error) {
 	peers, err := s.peersForShard(shard)
 	if err != nil {
@@ -1749,7 +1724,7 @@ func (s *session) fetchBlocksMetadataFromPeers(
 	)
 	go func() {
 		errCh <- s.streamBlocksMetadataFromPeers(namespace, shard,
-			peers, start, end, level, metadataCh, resultOpts, m, version)
+			peers, start, end, level, metadataCh, resultOpts, m)
 		close(metadataCh)
 		close(errCh)
 	}()
@@ -1766,12 +1741,7 @@ func (s *session) FetchBootstrapBlocksFromPeers(
 	shard uint32,
 	start, end time.Time,
 	opts result.Options,
-	version FetchBlocksMetadataEndpointVersion,
 ) (result.ShardResult, error) {
-	if !IsValidFetchBlocksMetadataEndpoint(version) {
-		return nil, errInvalidFetchBlocksMetadataVersion
-	}
-
 	var (
 		result = newBulkBlocksResult(s.opts, opts,
 			s.pools.tagDecoder, s.pools.id)
@@ -1810,7 +1780,7 @@ func (s *session) FetchBootstrapBlocksFromPeers(
 	errCh := make(chan error, 1)
 	go func() {
 		errCh <- s.streamBlocksMetadataFromPeers(nsMetadata.ID(), shard,
-			peers, start, end, level, metadataCh, opts, progress, version)
+			peers, start, end, level, metadataCh, opts, progress)
 		close(metadataCh)
 	}()
 
@@ -1920,7 +1890,6 @@ func (s *session) streamBlocksMetadataFromPeers(
 	metadataCh chan<- receivedBlockMetadata,
 	resultOpts result.Options,
 	progress *streamFromPeersMetrics,
-	version FetchBlocksMetadataEndpointVersion,
 ) error {
 	var (
 		wg        sync.WaitGroup
@@ -1988,18 +1957,8 @@ func (s *session) streamBlocksMetadataFromPeers(
 			}
 			for condition() {
 				var err error
-				switch version {
-				case FetchBlocksMetadataEndpointV1:
-					currPageToken, err = s.streamBlocksMetadataFromPeer(namespace, shardID,
-						peer, start, end, currPageToken, metadataCh, progress)
-				case FetchBlocksMetadataEndpointV2:
-					currPageToken, err = s.streamBlocksMetadataFromPeerV2(namespace, shardID,
-						peer, start, end, currPageToken, metadataCh, resultOpts, progress)
-				default:
-					// Should never happen - we validate the version before this function is
-					// ever called
-					err = xerrors.NewNonRetryableError(errInvalidFetchBlocksMetadataVersion)
-				}
+				currPageToken, err = s.streamBlocksMetadataFromPeerV2(namespace, shardID,
+					peer, start, end, currPageToken, metadataCh, resultOpts, progress)
 
 				// Set error or success if err is nil
 				errs.setError(idx, err)
@@ -2034,168 +1993,6 @@ func (s *session) streamBlocksMetadataFromPeers(
 // TODO(r): Delete this once we delete the V1 code path
 type pageToken interface{}
 
-// TODO(rartoul): Delete this once we delete the V1 code path
-func (s *session) streamBlocksMetadataFromPeer(
-	namespace ident.ID,
-	shard uint32,
-	peer peer,
-	start, end time.Time,
-	startPageToken pageToken,
-	ch chan<- receivedBlockMetadata,
-	progress *streamFromPeersMetrics,
-) (pageToken, error) {
-	var pageToken *int64
-	if startPageToken != nil {
-		var ok bool
-		pageToken, ok = startPageToken.(*int64)
-		if !ok {
-			err := fmt.Errorf("unexpected start page token type: %s",
-				reflect.TypeOf(startPageToken).Elem().String())
-			return nil, xerrors.NewNonRetryableError(err)
-		}
-	}
-
-	var (
-		optionIncludeSizes     = true
-		optionIncludeChecksums = true
-		optionIncludeLastRead  = true
-		moreResults            = true
-
-		// Only used for logs
-		peerStr              = peer.Host().ID()
-		metadataCountByBlock = map[xtime.UnixNano]int64{}
-	)
-
-	// Only used for logs
-	defer func() {
-		for block, numMetadata := range metadataCountByBlock {
-			s.log.WithFields(
-				xlog.NewField("shard", shard),
-				xlog.NewField("peer", peerStr),
-				xlog.NewField("numMetadata", numMetadata),
-				xlog.NewField("block", block),
-			).Debug("finished streaming blocks metadata from peer")
-		}
-	}()
-
-	// Declare before loop to avoid redeclaring each iteration
-	attemptFn := func(client rpc.TChanNode) error {
-		tctx, _ := thrift.NewContext(s.streamBlocksMetadataBatchTimeout)
-		req := rpc.NewFetchBlocksMetadataRawRequest()
-		req.NameSpace = namespace.Bytes()
-		req.Shard = int32(shard)
-		req.RangeStart = start.UnixNano()
-		req.RangeEnd = end.UnixNano()
-		req.Limit = int64(s.streamBlocksBatchSize)
-		req.PageToken = pageToken
-		req.IncludeSizes = &optionIncludeSizes
-		req.IncludeChecksums = &optionIncludeChecksums
-		req.IncludeLastRead = &optionIncludeLastRead
-
-		progress.metadataFetchBatchCall.Inc(1)
-		result, err := client.FetchBlocksMetadataRaw(tctx, req)
-		if err != nil {
-			progress.metadataFetchBatchError.Inc(1)
-			return err
-		}
-
-		progress.metadataFetchBatchSuccess.Inc(1)
-		progress.metadataReceived.Inc(int64(len(result.Elements)))
-
-		if result.NextPageToken != nil {
-			// Create space on the heap for the page token and take it's
-			// address to avoid having to keep the entire result around just
-			// for the page token
-			resultPageToken := *result.NextPageToken
-			pageToken = &resultPageToken
-		} else {
-			// No further results
-			moreResults = false
-		}
-
-		for _, elem := range result.Elements {
-			blockID := ident.BinaryID(checked.NewBytes(elem.ID, nil))
-			for _, b := range elem.Blocks {
-				blockStart := time.Unix(0, b.Start)
-
-				// Error occurred retrieving block metadata, use default values
-				if b.Err != nil {
-					progress.metadataFetchBatchBlockErr.Inc(1)
-					s.log.WithFields(
-						xlog.NewField("shard", shard),
-						xlog.NewField("peer", peerStr),
-						xlog.NewField("block", blockStart),
-						xlog.NewField("error", err),
-					).Error("error occurred retrieving block metadata")
-					// Enqueue with a zeroed checksum which triggers a fanout fetch
-					ch <- receivedBlockMetadata{
-						peer: peer,
-						id:   blockID,
-						block: blockMetadata{
-							start: blockStart,
-						},
-					}
-					continue
-				}
-
-				var size int64
-				if b.Size != nil {
-					size = *b.Size
-				}
-
-				var pChecksum *uint32
-				if b.Checksum != nil {
-					value := uint32(*b.Checksum)
-					pChecksum = &value
-				}
-
-				var lastRead time.Time
-				if b.LastRead != nil {
-					value, err := convert.ToTime(*b.LastRead, b.LastReadTimeType)
-					if err == nil {
-						lastRead = value
-					}
-				}
-
-				ch <- receivedBlockMetadata{
-					peer: peer,
-					id:   blockID,
-					block: blockMetadata{
-						start:    blockStart,
-						size:     size,
-						checksum: pChecksum,
-						lastRead: lastRead,
-					},
-				}
-
-				// Only used for logs
-				metadataCountByBlock[xtime.ToUnixNano(blockStart)]++
-			}
-		}
-
-		return nil
-	}
-
-	// NB(r): split the following methods up so they don't allocate
-	// a closure per fetch blocks call
-	var attemptErr error
-	checkedAttemptFn := func(client rpc.TChanNode) {
-		attemptErr = attemptFn(client)
-	}
-
-	fetchFn := func() error {
-		borrowErr := peer.BorrowConnection(checkedAttemptFn)
-		return xerrors.FirstError(borrowErr, attemptErr)
-	}
-
-	for moreResults {
-		if err := s.streamBlocksRetrier.Attempt(fetchFn); err != nil {
-			return pageToken, err
-		}
-	}
-	return nil, nil
-}
-
 // streamBlocksMetadataFromPeerV2 has several heap allocated anonymous
 // function, however, they're only allocated once per peer/shard combination
 // for the entire peer bootstrapping process so performance is acceptable
@@ -3872,48 +3669,6 @@ type idAndBlockStart struct {
 	blockStart int64
 }
 
-// IsValidFetchBlocksMetadataEndpoint returns a bool indicating whether the
-// specified endpointVersion is valid
-func IsValidFetchBlocksMetadataEndpoint(
-	endpointVersion FetchBlocksMetadataEndpointVersion,
-) bool {
-	for _, version := range validFetchBlocksMetadataEndpoints {
-		if version == endpointVersion {
-			return true
-		}
-	}
-	return false
-}
-
-// UnmarshalYAML unmarshals an FetchBlocksMetadataEndpointVersion into a valid type from string.
-func (v *FetchBlocksMetadataEndpointVersion) UnmarshalYAML(unmarshal func(interface{}) error) error {
-	var str string
-	if err := unmarshal(&str); err != nil {
-		return err
-	}
-	if str == "" {
-		return errFetchBlocksMetadataEndpointVersionUnspecified
-	}
-	for _, valid := range validFetchBlocksMetadataEndpoints {
-		if str == valid.String() {
-			*v = valid
-			return nil
-		}
-	}
-	return fmt.Errorf("invalid FetchBlocksMetadataEndpointVersion '%s' valid types are: %v",
-		str, validFetchBlocksMetadataEndpoints)
-}
-
-func (v FetchBlocksMetadataEndpointVersion) String() string {
-	switch v {
-	case FetchBlocksMetadataEndpointV1:
-		return "v1"
-	case FetchBlocksMetadataEndpointV2:
-		return "v2"
-	}
-	return "unknown"
-}
-
 func newTagsFromEncodedTags(
 	seriesID ident.ID,
 	encodedTags checked.Bytes,
diff --git a/src/dbnode/client/session_fetch_bulk_blocks_test.go b/src/dbnode/client/session_fetch_bulk_blocks_test.go
index 8c4232fce3..95869a314c 100644
--- a/src/dbnode/client/session_fetch_bulk_blocks_test.go
+++ b/src/dbnode/client/session_fetch_bulk_blocks_test.go
@@ -131,141 +131,6 @@ func testPeers(v []peer) peers {
 	return peers{peers: v, majorityReplicas: topology.Majority(len(v))}
 }
 
-// TODO(rartoul): Delete when we delete the V1 code path
-func TestFetchBootstrapBlocksAllPeersSucceed(t *testing.T) {
-	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
-
-	opts := newSessionTestAdminOptions()
-	s, err := newSession(opts)
-	require.NoError(t, err)
-	session := s.(*session)
-
-	mockHostQueues, mockClients := mockHostQueuesAndClientsForFetchBootstrapBlocks(ctrl, opts)
-	session.newHostQueueFn = mockHostQueues.newHostQueueFn()
-
-	// Don't drain the peer blocks queue, explicitly drain ourselves to
-	// avoid unpredictable batches being retrieved from peers
-	var (
-		qs      []*peerBlocksQueue
-		qsMutex sync.RWMutex
-	)
-	session.newPeerBlocksQueueFn = func(
-		peer peer,
-		maxQueueSize int,
-		_ time.Duration,
-		workers xsync.WorkerPool,
-		processFn processFn,
-	) *peerBlocksQueue {
-		qsMutex.Lock()
-		defer qsMutex.Unlock()
-		q := newPeerBlocksQueue(peer, maxQueueSize, 0, workers, processFn)
-		qs = append(qs, q)
-		return q
-	}
-
-	require.NoError(t, session.Open())
-
-	batchSize := opts.FetchSeriesBlocksBatchSize()
-
-	start := time.Now().Truncate(blockSize).Add(blockSize * -(24 - 1))
-
-	blocks := []testBlocks{
-		{
-			id: fooID,
-			blocks: []testBlock{
-				{
-					start: start.Add(blockSize * 1),
-					segments: &testBlockSegments{merged: &testBlockSegment{
-						head: []byte{1, 2},
-						tail: []byte{3},
-					}},
-				},
-			},
-		},
-		{
-			id: barID,
-			blocks: []testBlock{
-				{
-					start: start.Add(blockSize * 2),
-					segments: &testBlockSegments{merged: &testBlockSegment{
-						head: []byte{4, 5},
-						tail: []byte{6},
-					}},
-				},
-			},
-		},
-		{
-			id: bazID,
-			blocks: []testBlock{
-				{
-					start: start.Add(blockSize * 3),
-					segments: &testBlockSegments{merged: &testBlockSegment{
-						head: []byte{7, 8},
-						tail: []byte{9},
-					}},
-				},
-			},
-		},
-	}
-
-	// Expect the fetch metadata calls
-	metadataResult := resultMetadataFromBlocks(blocks)
-	// Skip the first client which is the client for the origin
-	mockClients[1:].expectFetchMetadataAndReturn(metadataResult, opts, false)
-
-	// Expect the fetch blocks calls
-	participating := len(mockClients) - 1
-	blocksExpectedReqs, blocksResult := expectedReqsAndResultFromBlocks(t,
-		blocks, batchSize, participating,
-		func(blockIdx int) (clientIdx int) {
-			// Round robin to match the best peer selection algorithm
-			return blockIdx % participating
-		})
-	// Skip the first client which is the client for the origin
-	for i, client := range mockClients[1:] {
-		expectFetchBlocksAndReturn(client, blocksExpectedReqs[i], blocksResult[i])
-	}
-
-	// Make sure peer selection is round robin to match our expected
-	// peer fetch calls
-	session.pickBestPeerFn = newRoundRobinPickBestPeerFn()
-
-	// Fetch blocks
-	go func() {
-		// Trigger peer queues to drain explicitly when all work enqueued
-		for {
-			qsMutex.RLock()
-			assigned := 0
-			for _, q := range qs {
-				assigned += int(atomic.LoadUint64(&q.assigned))
-			}
-			qsMutex.RUnlock()
-			if assigned == len(blocks) {
-				qsMutex.Lock()
-				defer qsMutex.Unlock()
-				for _, q := range qs {
-					q.drain()
-				}
-				return
-			}
-			time.Sleep(10 * time.Millisecond)
-		}
-	}()
-	rangeStart := start
-	rangeEnd := start.Add(blockSize * (24 - 1))
-	bootstrapOpts := newResultTestOptions()
-	result, err := session.FetchBootstrapBlocksFromPeers(
-		testsNsMetadata(t), 0, rangeStart, rangeEnd, bootstrapOpts, FetchBlocksMetadataEndpointV1)
-	assert.NoError(t, err)
-	assert.NotNil(t, result)
-
-	// Assert result
-	assertFetchBootstrapBlocksResult(t, blocks, result)
-
-	assert.NoError(t, session.Close())
-}
-
 func newRoundRobinPickBestPeerFn() pickBestPeerFn {
 	calls := int32(0)
 	return func(
@@ -360,7 +225,7 @@ func TestFetchBootstrapBlocksAllPeersSucceedV2(t *testing.T) {
 	// Expect the fetch metadata calls
 	metadataResult := resultMetadataFromBlocks(blocks)
 	// Skip the first client which is the client for the origin
-	mockClients[1:].expectFetchMetadataAndReturn(metadataResult, opts, true)
+	mockClients[1:].expectFetchMetadataAndReturn(metadataResult, opts)
 
 	// Expect the fetch blocks calls
 	participating := len(mockClients) - 1
@@ -404,7 +269,7 @@ func TestFetchBootstrapBlocksAllPeersSucceedV2(t *testing.T) {
 	rangeEnd := start.Add(blockSize * (24 - 1))
 	bootstrapOpts := newResultTestOptions()
 	result, err := session.FetchBootstrapBlocksFromPeers(
-		testsNsMetadata(t), 0, rangeStart, rangeEnd, bootstrapOpts, FetchBlocksMetadataEndpointV2)
+		testsNsMetadata(t), 0, rangeStart, rangeEnd, bootstrapOpts)
 	assert.NoError(t, err)
 	assert.NotNil(t, result)
 
@@ -1914,14 +1779,9 @@ type MockTChanNodes []*rpc.MockTChanNode
 func (c MockTChanNodes) expectFetchMetadataAndReturn(
 	result []testBlocksMetadata,
 	opts AdminOptions,
-	isV2 bool,
 ) {
 	for _, client := range c {
-		if isV2 {
-			expectFetchMetadataAndReturnV2(client, result, opts)
-		} else {
-			expectFetchMetadataAndReturn(client, result, opts)
-		}
+		expectFetchMetadataAndReturnV2(client, result, opts)
 	}
 }
 
@@ -2089,61 +1949,6 @@ func expectedReqsAndResultFromBlocks(
 	return clientsExpectReqs, clientsBlocksResult
 }
 
-// TODO(rartoul): Delete when we delete the V1 code path
-func expectFetchMetadataAndReturn(
-	client *rpc.MockTChanNode,
-	result []testBlocksMetadata,
-	opts AdminOptions,
-) {
-	batchSize := opts.FetchSeriesBlocksBatchSize()
-	totalCalls := int(math.Ceil(float64(len(result)) / float64(batchSize)))
-	includeSizes := true
-
-	var calls []*gomock.Call
-	for i := 0; i < totalCalls; i++ {
-		var (
-			ret      = &rpc.FetchBlocksMetadataRawResult_{}
-			beginIdx = i * batchSize
-			nextIdx  = int64(0)
-		)
-		for j := beginIdx; j < len(result) && j < beginIdx+batchSize; j++ {
-			elem := &rpc.BlocksMetadata{}
-			elem.ID = result[j].id.Bytes()
-			for k := 0; k < len(result[j].blocks); k++ {
-				bl := &rpc.BlockMetadata{}
-				bl.Start = result[j].blocks[k].start.UnixNano()
-				bl.Size = result[j].blocks[k].size
-				if result[j].blocks[k].checksum != nil {
-					checksum := int64(*result[j].blocks[k].checksum)
-					bl.Checksum = &checksum
-				}
-				elem.Blocks = append(elem.Blocks, bl)
-			}
-			ret.Elements = append(ret.Elements, elem)
-			nextIdx = int64(j) + 1
-		}
-		if i != totalCalls-1 {
-			// Include next page token if not last page
-			ret.NextPageToken = &nextIdx
-		}
-
-		matcher := &fetchMetadataReqMatcher{
-			shard:        0,
-			limit:        int64(batchSize),
-			includeSizes: &includeSizes,
-		}
-		if i != 0 {
-			expectPageToken := int64(beginIdx)
-			matcher.pageToken = &expectPageToken
-		}
-
-		call := client.EXPECT().FetchBlocksMetadataRaw(gomock.Any(), matcher).Return(ret, nil)
-		calls = append(calls, call)
-	}
-
-	gomock.InOrder(calls...)
-}
-
 func expectFetchMetadataAndReturnV2(
 	client *rpc.MockTChanNode,
 	result []testBlocksMetadata,
@@ -2198,64 +2003,12 @@ func expectFetchMetadataAndReturnV2(
 type fetchMetadataReqMatcher struct {
 	shard        int32
 	limit        int64
-	pageToken    *int64
 	pageTokenV2  []byte
 	includeSizes *bool
 	isV2         bool
 }
 
 func (m *fetchMetadataReqMatcher) Matches(x interface{}) bool {
-	if m.isV2 {
-		return m.matchesV2(x)
-	}
-	return m.matchesV1(x)
-}
-
-// TODO(rartoul): Delete when we delete the V1 code path
-func (m *fetchMetadataReqMatcher) matchesV1(x interface{}) bool {
-	req, ok := x.(*rpc.FetchBlocksMetadataRawRequest)
-	if !ok {
-		return false
-	}
-
-	if m.shard != req.Shard {
-		return false
-	}
-
-	if m.limit != req.Limit {
-		return false
-	}
-
-	if m.pageToken == nil {
-		if req.PageToken != nil {
-			return false
-		}
-	} else {
-		if req.PageToken == nil {
-			return false
-		}
-		if *req.PageToken != *m.pageToken {
-			return false
-		}
-	}
-
-	if m.includeSizes == nil {
-		if req.IncludeSizes != nil {
-			return false
-		}
-	} else {
-		if req.IncludeSizes == nil {
-			return false
-		}
-		if *req.IncludeSizes != *m.includeSizes {
-			return false
-		}
-	}
-
-	return true
-}
-
-func (m *fetchMetadataReqMatcher) matchesV2(x interface{}) bool {
 	req, ok := x.(*rpc.FetchBlocksMetadataRawV2Request)
 	if !ok {
 		return false
diff --git a/src/dbnode/client/types.go b/src/dbnode/client/types.go
index 13ef76a812..3464b7c501 100644
--- a/src/dbnode/client/types.go
+++ b/src/dbnode/client/types.go
@@ -170,7 +170,6 @@ type AdminSession interface {
 		shard uint32,
 		start, end time.Time,
 		opts result.Options,
-		version FetchBlocksMetadataEndpointVersion,
 	) (result.ShardResult, error)
 
 	// FetchBootstrapBlocksMetadataFromPeers will fetch the blocks metadata from
@@ -180,7 +179,6 @@ type AdminSession interface {
 		shard uint32,
 		start, end time.Time,
 		result result.Options,
-		version FetchBlocksMetadataEndpointVersion,
 	) (PeerBlockMetadataIter, error)
 
 	// FetchBlocksMetadataFromPeers will fetch the blocks metadata from
@@ -191,7 +189,6 @@ type AdminSession interface {
 		start, end time.Time,
 		consistencyLevel topology.ReadConsistencyLevel,
 		result result.Options,
-		version FetchBlocksMetadataEndpointVersion,
 	) (PeerBlockMetadataIter, error)
 
 	// FetchBlocksFromPeers will fetch the required blocks from the
diff --git a/src/dbnode/generated/thrift/rpc.thrift b/src/dbnode/generated/thrift/rpc.thrift
index 87ea9a8731..3e1e5b0c6d 100644
--- a/src/dbnode/generated/thrift/rpc.thrift
+++ b/src/dbnode/generated/thrift/rpc.thrift
@@ -53,8 +53,6 @@ service Node {
 	FetchBatchRawResult fetchBatchRaw(1: FetchBatchRawRequest req) throws (1: Error err)
 	FetchBlocksRawResult fetchBlocksRaw(1: FetchBlocksRawRequest req) throws (1: Error err)
 
-	// TODO(rartoul): Delete this once we delete the V1 code path
-	FetchBlocksMetadataRawResult fetchBlocksMetadataRaw(1: FetchBlocksMetadataRawRequest req) throws (1: Error err)
 	FetchBlocksMetadataRawV2Result fetchBlocksMetadataRawV2(1: FetchBlocksMetadataRawV2Request req) throws (1: Error err)
 	void writeBatchRaw(1: WriteBatchRawRequest req) throws (1: WriteBatchRawErrors err)
 	void writeTaggedBatchRaw(1: WriteTaggedBatchRawRequest req) throws (1: WriteBatchRawErrors err)
@@ -191,41 +189,6 @@ struct Tag {
   2: required string value
 }
 
-// TODO(rartoul): Delete this once we delete the V1 code path
-struct FetchBlocksMetadataRawRequest {
-	1: required binary nameSpace
-	2: required i32 shard
-	3: required i64 rangeStart
-	4: required i64 rangeEnd
-	5: required i64 limit
-	6: optional i64 pageToken
-	7: optional bool includeSizes
-	8: optional bool includeChecksums
-	9: optional bool includeLastRead
-}
-
-// TODO(rartoul): Delete this once we delete the V1 code path
-struct FetchBlocksMetadataRawResult {
-	1: required list<BlocksMetadata> elements
-	2: optional i64 nextPageToken
-}
-
-// TODO(rartoul): Delete this once we delete the V1 code path
-struct BlocksMetadata {
-	1: required binary id
-	2: required list<BlockMetadata> blocks
-}
-
-// TODO(rartoul): Delete this once we delete the V1 code path
-struct BlockMetadata {
-	1: optional Error err
-	2: required i64 start
-	3: optional i64 size
-	4: optional i64 checksum
-	5: optional i64 lastRead
-	6: optional TimeType lastReadTimeType = TimeType.UNIX_SECONDS
-}
-
 struct FetchBlocksMetadataRawV2Request {
 	1: required binary nameSpace
 	2: required i32 shard
diff --git a/src/dbnode/generated/thrift/rpc/rpc.go b/src/dbnode/generated/thrift/rpc/rpc.go
index f179472d83..00603dec31 100644
--- a/src/dbnode/generated/thrift/rpc/rpc.go
+++ b/src/dbnode/generated/thrift/rpc/rpc.go
@@ -4298,1103 +4298,6 @@ func (p *Tag) String() string {
 	return fmt.Sprintf("Tag(%+v)", *p)
 }
 
-// Attributes:
-//  - NameSpace
-//  - Shard
-//  - RangeStart
-//  - RangeEnd
-//  - Limit
-//  - PageToken
-//  - IncludeSizes
-//  - IncludeChecksums
-//  - IncludeLastRead
-type FetchBlocksMetadataRawRequest struct {
-	NameSpace        []byte `thrift:"nameSpace,1,required" db:"nameSpace" json:"nameSpace"`
-	Shard            int32  `thrift:"shard,2,required" db:"shard" json:"shard"`
-	RangeStart       int64  `thrift:"rangeStart,3,required" db:"rangeStart" json:"rangeStart"`
-	RangeEnd         int64  `thrift:"rangeEnd,4,required" db:"rangeEnd" json:"rangeEnd"`
-	Limit            int64  `thrift:"limit,5,required" db:"limit" json:"limit"`
-	PageToken        *int64 `thrift:"pageToken,6" db:"pageToken" json:"pageToken,omitempty"`
-	IncludeSizes     *bool  `thrift:"includeSizes,7" db:"includeSizes" json:"includeSizes,omitempty"`
-	IncludeChecksums *bool  `thrift:"includeChecksums,8" db:"includeChecksums" json:"includeChecksums,omitempty"`
-	IncludeLastRead  *bool  `thrift:"includeLastRead,9" db:"includeLastRead" json:"includeLastRead,omitempty"`
-}
-
-func NewFetchBlocksMetadataRawRequest() *FetchBlocksMetadataRawRequest {
-	return &FetchBlocksMetadataRawRequest{}
-}
-
-func (p *FetchBlocksMetadataRawRequest) GetNameSpace() []byte {
-	return p.NameSpace
-}
-
-func (p *FetchBlocksMetadataRawRequest) GetShard() int32 {
-	return p.Shard
-}
-
-func (p *FetchBlocksMetadataRawRequest) GetRangeStart() int64 {
-	return p.RangeStart
-}
-
-func (p *FetchBlocksMetadataRawRequest) GetRangeEnd() int64 {
-	return p.RangeEnd
-}
-
-func (p *FetchBlocksMetadataRawRequest) GetLimit() int64 {
-	return p.Limit
-}
-
-var FetchBlocksMetadataRawRequest_PageToken_DEFAULT int64
-
-func (p *FetchBlocksMetadataRawRequest) GetPageToken() int64 {
-	if !p.IsSetPageToken() {
-		return FetchBlocksMetadataRawRequest_PageToken_DEFAULT
-	}
-	return *p.PageToken
-}
-
-var FetchBlocksMetadataRawRequest_IncludeSizes_DEFAULT bool
-
-func (p *FetchBlocksMetadataRawRequest) GetIncludeSizes() bool {
-	if !p.IsSetIncludeSizes() {
-		return FetchBlocksMetadataRawRequest_IncludeSizes_DEFAULT
-	}
-	return *p.IncludeSizes
-}
-
-var FetchBlocksMetadataRawRequest_IncludeChecksums_DEFAULT bool
-
-func (p *FetchBlocksMetadataRawRequest) GetIncludeChecksums() bool {
-	if !p.IsSetIncludeChecksums() {
-		return FetchBlocksMetadataRawRequest_IncludeChecksums_DEFAULT
-	}
-	return *p.IncludeChecksums
-}
-
-var FetchBlocksMetadataRawRequest_IncludeLastRead_DEFAULT bool
-
-func (p *FetchBlocksMetadataRawRequest) GetIncludeLastRead() bool {
-	if !p.IsSetIncludeLastRead() {
-		return FetchBlocksMetadataRawRequest_IncludeLastRead_DEFAULT
-	}
-	return *p.IncludeLastRead
-}
-func (p *FetchBlocksMetadataRawRequest) IsSetPageToken() bool {
-	return p.PageToken != nil
-}
-
-func (p *FetchBlocksMetadataRawRequest) IsSetIncludeSizes() bool {
-	return p.IncludeSizes != nil
-}
-
-func (p *FetchBlocksMetadataRawRequest) IsSetIncludeChecksums() bool {
-	return p.IncludeChecksums != nil
-}
-
-func (p *FetchBlocksMetadataRawRequest) IsSetIncludeLastRead() bool {
-	return p.IncludeLastRead != nil
-}
-
-func (p *FetchBlocksMetadataRawRequest) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	var issetNameSpace bool = false
-	var issetShard bool = false
-	var issetRangeStart bool = false
-	var issetRangeEnd bool = false
-	var issetLimit bool = false
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.ReadField1(iprot); err != nil {
-				return err
-			}
-			issetNameSpace = true
-		case 2:
-			if err := p.ReadField2(iprot); err != nil {
-				return err
-			}
-			issetShard = true
-		case 3:
-			if err := p.ReadField3(iprot); err != nil {
-				return err
-			}
-			issetRangeStart = true
-		case 4:
-			if err := p.ReadField4(iprot); err != nil {
-				return err
-			}
-			issetRangeEnd = true
-		case 5:
-			if err := p.ReadField5(iprot); err != nil {
-				return err
-			}
-			issetLimit = true
-		case 6:
-			if err := p.ReadField6(iprot); err != nil {
-				return err
-			}
-		case 7:
-			if err := p.ReadField7(iprot); err != nil {
-				return err
-			}
-		case 8:
-			if err := p.ReadField8(iprot); err != nil {
-				return err
-			}
-		case 9:
-			if err := p.ReadField9(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	if !issetNameSpace {
-		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field NameSpace is not set"))
-	}
-	if !issetShard {
-		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Shard is not set"))
-	}
-	if !issetRangeStart {
-		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field RangeStart is not set"))
-	}
-	if !issetRangeEnd {
-		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field RangeEnd is not set"))
-	}
-	if !issetLimit {
-		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Limit is not set"))
-	}
-	return nil
-}
-
-func (p *FetchBlocksMetadataRawRequest) ReadField1(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadBinary(); err != nil {
-		return thrift.PrependError("error reading field 1: ", err)
-	} else {
-		p.NameSpace = v
-	}
-	return nil
-}
-
-func (p *FetchBlocksMetadataRawRequest) ReadField2(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI32(); err != nil {
-		return thrift.PrependError("error reading field 2: ", err)
-	} else {
-		p.Shard = v
-	}
-	return nil
-}
-
-func (p *FetchBlocksMetadataRawRequest) ReadField3(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI64(); err != nil {
-		return thrift.PrependError("error reading field 3: ", err)
-	} else {
-		p.RangeStart = v
-	}
-	return nil
-}
-
-func (p *FetchBlocksMetadataRawRequest) ReadField4(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI64(); err != nil {
-		return thrift.PrependError("error reading field 4: ", err)
-	} else {
-		p.RangeEnd = v
-	}
-	return nil
-}
-
-func (p *FetchBlocksMetadataRawRequest) ReadField5(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI64(); err != nil {
-		return thrift.PrependError("error reading field 5: ", err)
-	} else {
-		p.Limit = v
-	}
-	return nil
-}
-
-func (p *FetchBlocksMetadataRawRequest) ReadField6(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI64(); err != nil {
-		return thrift.PrependError("error reading field 6: ", err)
-	} else {
-		p.PageToken = &v
-	}
-	return nil
-}
-
-func (p *FetchBlocksMetadataRawRequest) ReadField7(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadBool(); err != nil {
-		return thrift.PrependError("error reading field 7: ", err)
-	} else {
-		p.IncludeSizes = &v
-	}
-	return nil
-}
-
-func (p *FetchBlocksMetadataRawRequest) ReadField8(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadBool(); err != nil {
-		return thrift.PrependError("error reading field 8: ", err)
-	} else {
-		p.IncludeChecksums = &v
-	}
-	return nil
-}
-
-func (p *FetchBlocksMetadataRawRequest) ReadField9(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadBool(); err != nil {
-		return thrift.PrependError("error reading field 9: ", err)
-	} else {
-		p.IncludeLastRead = &v
-	}
-	return nil
-}
-
-func (p *FetchBlocksMetadataRawRequest) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("FetchBlocksMetadataRawRequest"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if p != nil {
-		if err := p.writeField1(oprot); err != nil {
-			return err
-		}
-		if err := p.writeField2(oprot); err != nil {
-			return err
-		}
-		if err := p.writeField3(oprot); err != nil {
-			return err
-		}
-		if err := p.writeField4(oprot); err != nil {
-			return err
-		}
-		if err := p.writeField5(oprot); err != nil {
-			return err
-		}
-		if err := p.writeField6(oprot); err != nil {
-			return err
-		}
-		if err := p.writeField7(oprot); err != nil {
-			return err
-		}
-		if err := p.writeField8(oprot); err != nil {
-			return err
-		}
-		if err := p.writeField9(oprot); err != nil {
-			return err
-		}
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *FetchBlocksMetadataRawRequest) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("nameSpace", thrift.STRING, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:nameSpace: ", p), err)
-	}
-	if err := oprot.WriteBinary(p.NameSpace); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.nameSpace (1) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:nameSpace: ", p), err)
-	}
-	return err
-}
-
-func (p *FetchBlocksMetadataRawRequest) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("shard", thrift.I32, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:shard: ", p), err)
-	}
-	if err := oprot.WriteI32(int32(p.Shard)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.shard (2) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:shard: ", p), err)
-	}
-	return err
-}
-
-func (p *FetchBlocksMetadataRawRequest) writeField3(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("rangeStart", thrift.I64, 3); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:rangeStart: ", p), err)
-	}
-	if err := oprot.WriteI64(int64(p.RangeStart)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.rangeStart (3) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 3:rangeStart: ", p), err)
-	}
-	return err
-}
-
-func (p *FetchBlocksMetadataRawRequest) writeField4(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("rangeEnd", thrift.I64, 4); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:rangeEnd: ", p), err)
-	}
-	if err := oprot.WriteI64(int64(p.RangeEnd)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.rangeEnd (4) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 4:rangeEnd: ", p), err)
-	}
-	return err
-}
-
-func (p *FetchBlocksMetadataRawRequest) writeField5(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("limit", thrift.I64, 5); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:limit: ", p), err)
-	}
-	if err := oprot.WriteI64(int64(p.Limit)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.limit (5) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 5:limit: ", p), err)
-	}
-	return err
-}
-
-func (p *FetchBlocksMetadataRawRequest) writeField6(oprot thrift.TProtocol) (err error) {
-	if p.IsSetPageToken() {
-		if err := oprot.WriteFieldBegin("pageToken", thrift.I64, 6); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 6:pageToken: ", p), err)
-		}
-		if err := oprot.WriteI64(int64(*p.PageToken)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T.pageToken (6) field write error: ", p), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 6:pageToken: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *FetchBlocksMetadataRawRequest) writeField7(oprot thrift.TProtocol) (err error) {
-	if p.IsSetIncludeSizes() {
-		if err := oprot.WriteFieldBegin("includeSizes", thrift.BOOL, 7); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 7:includeSizes: ", p), err)
-		}
-		if err := oprot.WriteBool(bool(*p.IncludeSizes)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T.includeSizes (7) field write error: ", p), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 7:includeSizes: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *FetchBlocksMetadataRawRequest) writeField8(oprot thrift.TProtocol) (err error) {
-	if p.IsSetIncludeChecksums() {
-		if err := oprot.WriteFieldBegin("includeChecksums", thrift.BOOL, 8); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 8:includeChecksums: ", p), err)
-		}
-		if err := oprot.WriteBool(bool(*p.IncludeChecksums)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T.includeChecksums (8) field write error: ", p), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 8:includeChecksums: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *FetchBlocksMetadataRawRequest) writeField9(oprot thrift.TProtocol) (err error) {
-	if p.IsSetIncludeLastRead() {
-		if err := oprot.WriteFieldBegin("includeLastRead", thrift.BOOL, 9); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 9:includeLastRead: ", p), err)
-		}
-		if err := oprot.WriteBool(bool(*p.IncludeLastRead)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T.includeLastRead (9) field write error: ", p), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 9:includeLastRead: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *FetchBlocksMetadataRawRequest) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("FetchBlocksMetadataRawRequest(%+v)", *p)
-}
-
-// Attributes:
-//  - Elements
-//  - NextPageToken
-type FetchBlocksMetadataRawResult_ struct {
-	Elements      []*BlocksMetadata `thrift:"elements,1,required" db:"elements" json:"elements"`
-	NextPageToken *int64            `thrift:"nextPageToken,2" db:"nextPageToken" json:"nextPageToken,omitempty"`
-}
-
-func NewFetchBlocksMetadataRawResult_() *FetchBlocksMetadataRawResult_ {
-	return &FetchBlocksMetadataRawResult_{}
-}
-
-func (p *FetchBlocksMetadataRawResult_) GetElements() []*BlocksMetadata {
-	return p.Elements
-}
-
-var FetchBlocksMetadataRawResult__NextPageToken_DEFAULT int64
-
-func (p *FetchBlocksMetadataRawResult_) GetNextPageToken() int64 {
-	if !p.IsSetNextPageToken() {
-		return FetchBlocksMetadataRawResult__NextPageToken_DEFAULT
-	}
-	return *p.NextPageToken
-}
-func (p *FetchBlocksMetadataRawResult_) IsSetNextPageToken() bool {
-	return p.NextPageToken != nil
-}
-
-func (p *FetchBlocksMetadataRawResult_) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	var issetElements bool = false
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.ReadField1(iprot); err != nil {
-				return err
-			}
-			issetElements = true
-		case 2:
-			if err := p.ReadField2(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	if !issetElements {
-		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Elements is not set"))
-	}
-	return nil
-}
-
-func (p *FetchBlocksMetadataRawResult_) ReadField1(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadListBegin()
-	if err != nil {
-		return thrift.PrependError("error reading list begin: ", err)
-	}
-	tSlice := make([]*BlocksMetadata, 0, size)
-	p.Elements = tSlice
-	for i := 0; i < size; i++ {
-		_elem13 := &BlocksMetadata{}
-		if err := _elem13.Read(iprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem13), err)
-		}
-		p.Elements = append(p.Elements, _elem13)
-	}
-	if err := iprot.ReadListEnd(); err != nil {
-		return thrift.PrependError("error reading list end: ", err)
-	}
-	return nil
-}
-
-func (p *FetchBlocksMetadataRawResult_) ReadField2(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI64(); err != nil {
-		return thrift.PrependError("error reading field 2: ", err)
-	} else {
-		p.NextPageToken = &v
-	}
-	return nil
-}
-
-func (p *FetchBlocksMetadataRawResult_) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("FetchBlocksMetadataRawResult"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if p != nil {
-		if err := p.writeField1(oprot); err != nil {
-			return err
-		}
-		if err := p.writeField2(oprot); err != nil {
-			return err
-		}
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *FetchBlocksMetadataRawResult_) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("elements", thrift.LIST, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:elements: ", p), err)
-	}
-	if err := oprot.WriteListBegin(thrift.STRUCT, len(p.Elements)); err != nil {
-		return thrift.PrependError("error writing list begin: ", err)
-	}
-	for _, v := range p.Elements {
-		if err := v.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
-		}
-	}
-	if err := oprot.WriteListEnd(); err != nil {
-		return thrift.PrependError("error writing list end: ", err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:elements: ", p), err)
-	}
-	return err
-}
-
-func (p *FetchBlocksMetadataRawResult_) writeField2(oprot thrift.TProtocol) (err error) {
-	if p.IsSetNextPageToken() {
-		if err := oprot.WriteFieldBegin("nextPageToken", thrift.I64, 2); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:nextPageToken: ", p), err)
-		}
-		if err := oprot.WriteI64(int64(*p.NextPageToken)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T.nextPageToken (2) field write error: ", p), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 2:nextPageToken: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *FetchBlocksMetadataRawResult_) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("FetchBlocksMetadataRawResult_(%+v)", *p)
-}
-
-// Attributes:
-//  - ID
-//  - Blocks
-type BlocksMetadata struct {
-	ID     []byte           `thrift:"id,1,required" db:"id" json:"id"`
-	Blocks []*BlockMetadata `thrift:"blocks,2,required" db:"blocks" json:"blocks"`
-}
-
-func NewBlocksMetadata() *BlocksMetadata {
-	return &BlocksMetadata{}
-}
-
-func (p *BlocksMetadata) GetID() []byte {
-	return p.ID
-}
-
-func (p *BlocksMetadata) GetBlocks() []*BlockMetadata {
-	return p.Blocks
-}
-func (p *BlocksMetadata) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	var issetID bool = false
-	var issetBlocks bool = false
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.ReadField1(iprot); err != nil {
-				return err
-			}
-			issetID = true
-		case 2:
-			if err := p.ReadField2(iprot); err != nil {
-				return err
-			}
-			issetBlocks = true
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	if !issetID {
-		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field ID is not set"))
-	}
-	if !issetBlocks {
-		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Blocks is not set"))
-	}
-	return nil
-}
-
-func (p *BlocksMetadata) ReadField1(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadBinary(); err != nil {
-		return thrift.PrependError("error reading field 1: ", err)
-	} else {
-		p.ID = v
-	}
-	return nil
-}
-
-func (p *BlocksMetadata) ReadField2(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadListBegin()
-	if err != nil {
-		return thrift.PrependError("error reading list begin: ", err)
-	}
-	tSlice := make([]*BlockMetadata, 0, size)
-	p.Blocks = tSlice
-	for i := 0; i < size; i++ {
-		_elem14 := &BlockMetadata{
-			LastReadTimeType: 0,
-		}
-		if err := _elem14.Read(iprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem14), err)
-		}
-		p.Blocks = append(p.Blocks, _elem14)
-	}
-	if err := iprot.ReadListEnd(); err != nil {
-		return thrift.PrependError("error reading list end: ", err)
-	}
-	return nil
-}
-
-func (p *BlocksMetadata) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("BlocksMetadata"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if p != nil {
-		if err := p.writeField1(oprot); err != nil {
-			return err
-		}
-		if err := p.writeField2(oprot); err != nil {
-			return err
-		}
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *BlocksMetadata) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("id", thrift.STRING, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:id: ", p), err)
-	}
-	if err := oprot.WriteBinary(p.ID); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.id (1) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:id: ", p), err)
-	}
-	return err
-}
-
-func (p *BlocksMetadata) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("blocks", thrift.LIST, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:blocks: ", p), err)
-	}
-	if err := oprot.WriteListBegin(thrift.STRUCT, len(p.Blocks)); err != nil {
-		return thrift.PrependError("error writing list begin: ", err)
-	}
-	for _, v := range p.Blocks {
-		if err := v.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
-		}
-	}
-	if err := oprot.WriteListEnd(); err != nil {
-		return thrift.PrependError("error writing list end: ", err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:blocks: ", p), err)
-	}
-	return err
-}
-
-func (p *BlocksMetadata) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("BlocksMetadata(%+v)", *p)
-}
-
-// Attributes:
-//  - Err
-//  - Start
-//  - Size
-//  - Checksum
-//  - LastRead
-//  - LastReadTimeType
-type BlockMetadata struct {
-	Err              *Error   `thrift:"err,1" db:"err" json:"err,omitempty"`
-	Start            int64    `thrift:"start,2,required" db:"start" json:"start"`
-	Size             *int64   `thrift:"size,3" db:"size" json:"size,omitempty"`
-	Checksum         *int64   `thrift:"checksum,4" db:"checksum" json:"checksum,omitempty"`
-	LastRead         *int64   `thrift:"lastRead,5" db:"lastRead" json:"lastRead,omitempty"`
-	LastReadTimeType TimeType `thrift:"lastReadTimeType,6" db:"lastReadTimeType" json:"lastReadTimeType,omitempty"`
-}
-
-func NewBlockMetadata() *BlockMetadata {
-	return &BlockMetadata{
-		LastReadTimeType: 0,
-	}
-}
-
-var BlockMetadata_Err_DEFAULT *Error
-
-func (p *BlockMetadata) GetErr() *Error {
-	if !p.IsSetErr() {
-		return BlockMetadata_Err_DEFAULT
-	}
-	return p.Err
-}
-
-func (p *BlockMetadata) GetStart() int64 {
-	return p.Start
-}
-
-var BlockMetadata_Size_DEFAULT int64
-
-func (p *BlockMetadata) GetSize() int64 {
-	if !p.IsSetSize() {
-		return BlockMetadata_Size_DEFAULT
-	}
-	return *p.Size
-}
-
-var BlockMetadata_Checksum_DEFAULT int64
-
-func (p *BlockMetadata) GetChecksum() int64 {
-	if !p.IsSetChecksum() {
-		return BlockMetadata_Checksum_DEFAULT
-	}
-	return *p.Checksum
-}
-
-var BlockMetadata_LastRead_DEFAULT int64
-
-func (p *BlockMetadata) GetLastRead() int64 {
-	if !p.IsSetLastRead() {
-		return BlockMetadata_LastRead_DEFAULT
-	}
-	return *p.LastRead
-}
-
-var BlockMetadata_LastReadTimeType_DEFAULT TimeType = 0
-
-func (p *BlockMetadata) GetLastReadTimeType() TimeType {
-	return p.LastReadTimeType
-}
-func (p *BlockMetadata) IsSetErr() bool {
-	return p.Err != nil
-}
-
-func (p *BlockMetadata) IsSetSize() bool {
-	return p.Size != nil
-}
-
-func (p *BlockMetadata) IsSetChecksum() bool {
-	return p.Checksum != nil
-}
-
-func (p *BlockMetadata) IsSetLastRead() bool {
-	return p.LastRead != nil
-}
-
-func (p *BlockMetadata) IsSetLastReadTimeType() bool {
-	return p.LastReadTimeType != BlockMetadata_LastReadTimeType_DEFAULT
-}
-
-func (p *BlockMetadata) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	var issetStart bool = false
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.ReadField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.ReadField2(iprot); err != nil {
-				return err
-			}
-			issetStart = true
-		case 3:
-			if err := p.ReadField3(iprot); err != nil {
-				return err
-			}
-		case 4:
-			if err := p.ReadField4(iprot); err != nil {
-				return err
-			}
-		case 5:
-			if err := p.ReadField5(iprot); err != nil {
-				return err
-			}
-		case 6:
-			if err := p.ReadField6(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	if !issetStart {
-		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Start is not set"))
-	}
-	return nil
-}
-
-func (p *BlockMetadata) ReadField1(iprot thrift.TProtocol) error {
-	p.Err = &Error{
-		Type: 0,
-	}
-	if err := p.Err.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Err), err)
-	}
-	return nil
-}
-
-func (p *BlockMetadata) ReadField2(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI64(); err != nil {
-		return thrift.PrependError("error reading field 2: ", err)
-	} else {
-		p.Start = v
-	}
-	return nil
-}
-
-func (p *BlockMetadata) ReadField3(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI64(); err != nil {
-		return thrift.PrependError("error reading field 3: ", err)
-	} else {
-		p.Size = &v
-	}
-	return nil
-}
-
-func (p *BlockMetadata) ReadField4(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI64(); err != nil {
-		return thrift.PrependError("error reading field 4: ", err)
-	} else {
-		p.Checksum = &v
-	}
-	return nil
-}
-
-func (p *BlockMetadata) ReadField5(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI64(); err != nil {
-		return thrift.PrependError("error reading field 5: ", err)
-	} else {
-		p.LastRead = &v
-	}
-	return nil
-}
-
-func (p *BlockMetadata) ReadField6(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI32(); err != nil {
-		return thrift.PrependError("error reading field 6: ", err)
-	} else {
-		temp := TimeType(v)
-		p.LastReadTimeType = temp
-	}
-	return nil
-}
-
-func (p *BlockMetadata) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("BlockMetadata"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if p != nil {
-		if err := p.writeField1(oprot); err != nil {
-			return err
-		}
-		if err := p.writeField2(oprot); err != nil {
-			return err
-		}
-		if err := p.writeField3(oprot); err != nil {
-			return err
-		}
-		if err := p.writeField4(oprot); err != nil {
-			return err
-		}
-		if err := p.writeField5(oprot); err != nil {
-			return err
-		}
-		if err := p.writeField6(oprot); err != nil {
-			return err
-		}
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *BlockMetadata) writeField1(oprot thrift.TProtocol) (err error) {
-	if p.IsSetErr() {
-		if err := oprot.WriteFieldBegin("err", thrift.STRUCT, 1); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:err: ", p), err)
-		}
-		if err := p.Err.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Err), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 1:err: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *BlockMetadata) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("start", thrift.I64, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:start: ", p), err)
-	}
-	if err := oprot.WriteI64(int64(p.Start)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.start (2) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:start: ", p), err)
-	}
-	return err
-}
-
-func (p *BlockMetadata) writeField3(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSize() {
-		if err := oprot.WriteFieldBegin("size", thrift.I64, 3); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:size: ", p), err)
-		}
-		if err := oprot.WriteI64(int64(*p.Size)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T.size (3) field write error: ", p), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 3:size: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *BlockMetadata) writeField4(oprot thrift.TProtocol) (err error) {
-	if p.IsSetChecksum() {
-		if err := oprot.WriteFieldBegin("checksum", thrift.I64, 4); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:checksum: ", p), err)
-		}
-		if err := oprot.WriteI64(int64(*p.Checksum)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T.checksum (4) field write error: ", p), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 4:checksum: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *BlockMetadata) writeField5(oprot thrift.TProtocol) (err error) {
-	if p.IsSetLastRead() {
-		if err := oprot.WriteFieldBegin("lastRead", thrift.I64, 5); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:lastRead: ", p), err)
-		}
-		if err := oprot.WriteI64(int64(*p.LastRead)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T.lastRead (5) field write error: ", p), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 5:lastRead: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *BlockMetadata) writeField6(oprot thrift.TProtocol) (err error) {
-	if p.IsSetLastReadTimeType() {
-		if err := oprot.WriteFieldBegin("lastReadTimeType", thrift.I32, 6); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 6:lastReadTimeType: ", p), err)
-		}
-		if err := oprot.WriteI32(int32(p.LastReadTimeType)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T.lastReadTimeType (6) field write error: ", p), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 6:lastReadTimeType: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *BlockMetadata) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("BlockMetadata(%+v)", *p)
-}
-
 // Attributes:
 //  - NameSpace
 //  - Shard
@@ -5911,13 +4814,13 @@ func (p *FetchBlocksMetadataRawV2Result_) ReadField1(iprot thrift.TProtocol) err
 	tSlice := make([]*BlockMetadataV2, 0, size)
 	p.Elements = tSlice
 	for i := 0; i < size; i++ {
-		_elem15 := &BlockMetadataV2{
+		_elem13 := &BlockMetadataV2{
 			LastReadTimeType: 0,
 		}
-		if err := _elem15.Read(iprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem15), err)
+		if err := _elem13.Read(iprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem13), err)
 		}
-		p.Elements = append(p.Elements, _elem15)
+		p.Elements = append(p.Elements, _elem13)
 	}
 	if err := iprot.ReadListEnd(); err != nil {
 		return thrift.PrependError("error reading list end: ", err)
@@ -6495,11 +5398,11 @@ func (p *WriteBatchRawRequest) ReadField2(iprot thrift.TProtocol) error {
 	tSlice := make([]*WriteBatchRawRequestElement, 0, size)
 	p.Elements = tSlice
 	for i := 0; i < size; i++ {
-		_elem16 := &WriteBatchRawRequestElement{}
-		if err := _elem16.Read(iprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem16), err)
+		_elem14 := &WriteBatchRawRequestElement{}
+		if err := _elem14.Read(iprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem14), err)
 		}
-		p.Elements = append(p.Elements, _elem16)
+		p.Elements = append(p.Elements, _elem14)
 	}
 	if err := iprot.ReadListEnd(); err != nil {
 		return thrift.PrependError("error reading list end: ", err)
@@ -6802,11 +5705,11 @@ func (p *WriteTaggedBatchRawRequest) ReadField2(iprot thrift.TProtocol) error {
 	tSlice := make([]*WriteTaggedBatchRawRequestElement, 0, size)
 	p.Elements = tSlice
 	for i := 0; i < size; i++ {
-		_elem17 := &WriteTaggedBatchRawRequestElement{}
-		if err := _elem17.Read(iprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem17), err)
+		_elem15 := &WriteTaggedBatchRawRequestElement{}
+		if err := _elem15.Read(iprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem15), err)
 		}
-		p.Elements = append(p.Elements, _elem17)
+		p.Elements = append(p.Elements, _elem15)
 	}
 	if err := iprot.ReadListEnd(); err != nil {
 		return thrift.PrependError("error reading list end: ", err)
@@ -9327,11 +8230,11 @@ func (p *QueryResult_) ReadField1(iprot thrift.TProtocol) error {
 	tSlice := make([]*QueryResultElement, 0, size)
 	p.Results = tSlice
 	for i := 0; i < size; i++ {
-		_elem18 := &QueryResultElement{}
-		if err := _elem18.Read(iprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem18), err)
+		_elem16 := &QueryResultElement{}
+		if err := _elem16.Read(iprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem16), err)
 		}
-		p.Results = append(p.Results, _elem18)
+		p.Results = append(p.Results, _elem16)
 	}
 	if err := iprot.ReadListEnd(); err != nil {
 		return thrift.PrependError("error reading list end: ", err)
@@ -9509,11 +8412,11 @@ func (p *QueryResultElement) ReadField2(iprot thrift.TProtocol) error {
 	tSlice := make([]*Tag, 0, size)
 	p.Tags = tSlice
 	for i := 0; i < size; i++ {
-		_elem19 := &Tag{}
-		if err := _elem19.Read(iprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem19), err)
+		_elem17 := &Tag{}
+		if err := _elem17.Read(iprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem17), err)
 		}
-		p.Tags = append(p.Tags, _elem19)
+		p.Tags = append(p.Tags, _elem17)
 	}
 	if err := iprot.ReadListEnd(); err != nil {
 		return thrift.PrependError("error reading list end: ", err)
@@ -9529,13 +8432,13 @@ func (p *QueryResultElement) ReadField3(iprot thrift.TProtocol) error {
 	tSlice := make([]*Datapoint, 0, size)
 	p.Datapoints = tSlice
 	for i := 0; i < size; i++ {
-		_elem20 := &Datapoint{
+		_elem18 := &Datapoint{
 			TimestampTimeType: 0,
 		}
-		if err := _elem20.Read(iprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem20), err)
+		if err := _elem18.Read(iprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem18), err)
 		}
-		p.Datapoints = append(p.Datapoints, _elem20)
+		p.Datapoints = append(p.Datapoints, _elem18)
 	}
 	if err := iprot.ReadListEnd(); err != nil {
 		return thrift.PrependError("error reading list end: ", err)
@@ -10074,11 +8977,11 @@ func (p *ConjunctionQuery) ReadField1(iprot thrift.TProtocol) error {
 	tSlice := make([]*Query, 0, size)
 	p.Queries = tSlice
 	for i := 0; i < size; i++ {
-		_elem21 := &Query{}
-		if err := _elem21.Read(iprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem21), err)
+		_elem19 := &Query{}
+		if err := _elem19.Read(iprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem19), err)
 		}
-		p.Queries = append(p.Queries, _elem21)
+		p.Queries = append(p.Queries, _elem19)
 	}
 	if err := iprot.ReadListEnd(); err != nil {
 		return thrift.PrependError("error reading list end: ", err)
@@ -10192,11 +9095,11 @@ func (p *DisjunctionQuery) ReadField1(iprot thrift.TProtocol) error {
 	tSlice := make([]*Query, 0, size)
 	p.Queries = tSlice
 	for i := 0; i < size; i++ {
-		_elem22 := &Query{}
-		if err := _elem22.Read(iprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem22), err)
+		_elem20 := &Query{}
+		if err := _elem20.Read(iprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem20), err)
 		}
-		p.Queries = append(p.Queries, _elem22)
+		p.Queries = append(p.Queries, _elem20)
 	}
 	if err := iprot.ReadListEnd(); err != nil {
 		return thrift.PrependError("error reading list end: ", err)
@@ -10557,9 +9460,6 @@ type Node interface {
 	FetchBlocksRaw(req *FetchBlocksRawRequest) (r *FetchBlocksRawResult_, err error)
 	// Parameters:
 	//  - Req
-	FetchBlocksMetadataRaw(req *FetchBlocksMetadataRawRequest) (r *FetchBlocksMetadataRawResult_, err error)
-	// Parameters:
-	//  - Req
 	FetchBlocksMetadataRawV2(req *FetchBlocksMetadataRawV2Request) (r *FetchBlocksMetadataRawV2Result_, err error)
 	// Parameters:
 	//  - Req
@@ -10667,16 +9567,16 @@ func (p *NodeClient) recvQuery() (value *QueryResult_, err error) {
 		return
 	}
 	if mTypeId == thrift.EXCEPTION {
-		error23 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error24 error
-		error24, err = error23.Read(iprot)
+		error21 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
+		var error22 error
+		error22, err = error21.Read(iprot)
 		if err != nil {
 			return
 		}
 		if err = iprot.ReadMessageEnd(); err != nil {
 			return
 		}
-		err = error24
+		err = error22
 		return
 	}
 	if mTypeId != thrift.REPLY {
@@ -10748,16 +9648,16 @@ func (p *NodeClient) recvFetch() (value *FetchResult_, err error) {
 		return
 	}
 	if mTypeId == thrift.EXCEPTION {
-		error25 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error26 error
-		error26, err = error25.Read(iprot)
+		error23 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
+		var error24 error
+		error24, err = error23.Read(iprot)
 		if err != nil {
 			return
 		}
 		if err = iprot.ReadMessageEnd(); err != nil {
 			return
 		}
-		err = error26
+		err = error24
 		return
 	}
 	if mTypeId != thrift.REPLY {
@@ -10829,16 +9729,16 @@ func (p *NodeClient) recvFetchTagged() (value *FetchTaggedResult_, err error) {
 		return
 	}
 	if mTypeId == thrift.EXCEPTION {
-		error27 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error28 error
-		error28, err = error27.Read(iprot)
+		error25 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
+		var error26 error
+		error26, err = error25.Read(iprot)
 		if err != nil {
 			return
 		}
 		if err = iprot.ReadMessageEnd(); err != nil {
 			return
 		}
-		err = error28
+		err = error26
 		return
 	}
 	if mTypeId != thrift.REPLY {
@@ -10910,103 +9810,23 @@ func (p *NodeClient) recvWrite() (err error) {
 		return
 	}
 	if mTypeId == thrift.EXCEPTION {
-		error29 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error30 error
-		error30, err = error29.Read(iprot)
-		if err != nil {
-			return
-		}
-		if err = iprot.ReadMessageEnd(); err != nil {
-			return
-		}
-		err = error30
-		return
-	}
-	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "write failed: invalid message type")
-		return
-	}
-	result := NodeWriteResult{}
-	if err = result.Read(iprot); err != nil {
-		return
-	}
-	if err = iprot.ReadMessageEnd(); err != nil {
-		return
-	}
-	if result.Err != nil {
-		err = result.Err
-		return
-	}
-	return
-}
-
-// Parameters:
-//  - Req
-func (p *NodeClient) WriteTagged(req *WriteTaggedRequest) (err error) {
-	if err = p.sendWriteTagged(req); err != nil {
-		return
-	}
-	return p.recvWriteTagged()
-}
-
-func (p *NodeClient) sendWriteTagged(req *WriteTaggedRequest) (err error) {
-	oprot := p.OutputProtocol
-	if oprot == nil {
-		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.OutputProtocol = oprot
-	}
-	p.SeqId++
-	if err = oprot.WriteMessageBegin("writeTagged", thrift.CALL, p.SeqId); err != nil {
-		return
-	}
-	args := NodeWriteTaggedArgs{
-		Req: req,
-	}
-	if err = args.Write(oprot); err != nil {
-		return
-	}
-	if err = oprot.WriteMessageEnd(); err != nil {
-		return
-	}
-	return oprot.Flush()
-}
-
-func (p *NodeClient) recvWriteTagged() (err error) {
-	iprot := p.InputProtocol
-	if iprot == nil {
-		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.InputProtocol = iprot
-	}
-	method, mTypeId, seqId, err := iprot.ReadMessageBegin()
-	if err != nil {
-		return
-	}
-	if method != "writeTagged" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "writeTagged failed: wrong method name")
-		return
-	}
-	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "writeTagged failed: out of sequence response")
-		return
-	}
-	if mTypeId == thrift.EXCEPTION {
-		error31 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error32 error
-		error32, err = error31.Read(iprot)
+		error27 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
+		var error28 error
+		error28, err = error27.Read(iprot)
 		if err != nil {
 			return
 		}
 		if err = iprot.ReadMessageEnd(); err != nil {
 			return
 		}
-		err = error32
+		err = error28
 		return
 	}
 	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "writeTagged failed: invalid message type")
+		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "write failed: invalid message type")
 		return
 	}
-	result := NodeWriteTaggedResult{}
+	result := NodeWriteResult{}
 	if err = result.Read(iprot); err != nil {
 		return
 	}
@@ -11022,24 +9842,24 @@ func (p *NodeClient) recvWriteTagged() (err error) {
 
 // Parameters:
 //  - Req
-func (p *NodeClient) FetchBatchRaw(req *FetchBatchRawRequest) (r *FetchBatchRawResult_, err error) {
-	if err = p.sendFetchBatchRaw(req); err != nil {
+func (p *NodeClient) WriteTagged(req *WriteTaggedRequest) (err error) {
+	if err = p.sendWriteTagged(req); err != nil {
 		return
 	}
-	return p.recvFetchBatchRaw()
+	return p.recvWriteTagged()
 }
 
-func (p *NodeClient) sendFetchBatchRaw(req *FetchBatchRawRequest) (err error) {
+func (p *NodeClient) sendWriteTagged(req *WriteTaggedRequest) (err error) {
 	oprot := p.OutputProtocol
 	if oprot == nil {
 		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
 		p.OutputProtocol = oprot
 	}
 	p.SeqId++
-	if err = oprot.WriteMessageBegin("fetchBatchRaw", thrift.CALL, p.SeqId); err != nil {
+	if err = oprot.WriteMessageBegin("writeTagged", thrift.CALL, p.SeqId); err != nil {
 		return
 	}
-	args := NodeFetchBatchRawArgs{
+	args := NodeWriteTaggedArgs{
 		Req: req,
 	}
 	if err = args.Write(oprot); err != nil {
@@ -11051,7 +9871,7 @@ func (p *NodeClient) sendFetchBatchRaw(req *FetchBatchRawRequest) (err error) {
 	return oprot.Flush()
 }
 
-func (p *NodeClient) recvFetchBatchRaw() (value *FetchBatchRawResult_, err error) {
+func (p *NodeClient) recvWriteTagged() (err error) {
 	iprot := p.InputProtocol
 	if iprot == nil {
 		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
@@ -11061,32 +9881,32 @@ func (p *NodeClient) recvFetchBatchRaw() (value *FetchBatchRawResult_, err error
 	if err != nil {
 		return
 	}
-	if method != "fetchBatchRaw" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "fetchBatchRaw failed: wrong method name")
+	if method != "writeTagged" {
+		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "writeTagged failed: wrong method name")
 		return
 	}
 	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "fetchBatchRaw failed: out of sequence response")
+		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "writeTagged failed: out of sequence response")
 		return
 	}
 	if mTypeId == thrift.EXCEPTION {
-		error33 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error34 error
-		error34, err = error33.Read(iprot)
+		error29 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
+		var error30 error
+		error30, err = error29.Read(iprot)
 		if err != nil {
 			return
 		}
 		if err = iprot.ReadMessageEnd(); err != nil {
 			return
 		}
-		err = error34
+		err = error30
 		return
 	}
 	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "fetchBatchRaw failed: invalid message type")
+		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "writeTagged failed: invalid message type")
 		return
 	}
-	result := NodeFetchBatchRawResult{}
+	result := NodeWriteTaggedResult{}
 	if err = result.Read(iprot); err != nil {
 		return
 	}
@@ -11097,30 +9917,29 @@ func (p *NodeClient) recvFetchBatchRaw() (value *FetchBatchRawResult_, err error
 		err = result.Err
 		return
 	}
-	value = result.GetSuccess()
 	return
 }
 
 // Parameters:
 //  - Req
-func (p *NodeClient) FetchBlocksRaw(req *FetchBlocksRawRequest) (r *FetchBlocksRawResult_, err error) {
-	if err = p.sendFetchBlocksRaw(req); err != nil {
+func (p *NodeClient) FetchBatchRaw(req *FetchBatchRawRequest) (r *FetchBatchRawResult_, err error) {
+	if err = p.sendFetchBatchRaw(req); err != nil {
 		return
 	}
-	return p.recvFetchBlocksRaw()
+	return p.recvFetchBatchRaw()
 }
 
-func (p *NodeClient) sendFetchBlocksRaw(req *FetchBlocksRawRequest) (err error) {
+func (p *NodeClient) sendFetchBatchRaw(req *FetchBatchRawRequest) (err error) {
 	oprot := p.OutputProtocol
 	if oprot == nil {
 		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
 		p.OutputProtocol = oprot
 	}
 	p.SeqId++
-	if err = oprot.WriteMessageBegin("fetchBlocksRaw", thrift.CALL, p.SeqId); err != nil {
+	if err = oprot.WriteMessageBegin("fetchBatchRaw", thrift.CALL, p.SeqId); err != nil {
 		return
 	}
-	args := NodeFetchBlocksRawArgs{
+	args := NodeFetchBatchRawArgs{
 		Req: req,
 	}
 	if err = args.Write(oprot); err != nil {
@@ -11132,7 +9951,7 @@ func (p *NodeClient) sendFetchBlocksRaw(req *FetchBlocksRawRequest) (err error)
 	return oprot.Flush()
 }
 
-func (p *NodeClient) recvFetchBlocksRaw() (value *FetchBlocksRawResult_, err error) {
+func (p *NodeClient) recvFetchBatchRaw() (value *FetchBatchRawResult_, err error) {
 	iprot := p.InputProtocol
 	if iprot == nil {
 		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
@@ -11142,32 +9961,32 @@ func (p *NodeClient) recvFetchBlocksRaw() (value *FetchBlocksRawResult_, err err
 	if err != nil {
 		return
 	}
-	if method != "fetchBlocksRaw" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "fetchBlocksRaw failed: wrong method name")
+	if method != "fetchBatchRaw" {
+		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "fetchBatchRaw failed: wrong method name")
 		return
 	}
 	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "fetchBlocksRaw failed: out of sequence response")
+		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "fetchBatchRaw failed: out of sequence response")
 		return
 	}
 	if mTypeId == thrift.EXCEPTION {
-		error35 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error36 error
-		error36, err = error35.Read(iprot)
+		error31 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
+		var error32 error
+		error32, err = error31.Read(iprot)
 		if err != nil {
 			return
 		}
 		if err = iprot.ReadMessageEnd(); err != nil {
 			return
 		}
-		err = error36
+		err = error32
 		return
 	}
 	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "fetchBlocksRaw failed: invalid message type")
+		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "fetchBatchRaw failed: invalid message type")
 		return
 	}
-	result := NodeFetchBlocksRawResult{}
+	result := NodeFetchBatchRawResult{}
 	if err = result.Read(iprot); err != nil {
 		return
 	}
@@ -11184,24 +10003,24 @@ func (p *NodeClient) recvFetchBlocksRaw() (value *FetchBlocksRawResult_, err err
 
 // Parameters:
 //  - Req
-func (p *NodeClient) FetchBlocksMetadataRaw(req *FetchBlocksMetadataRawRequest) (r *FetchBlocksMetadataRawResult_, err error) {
-	if err = p.sendFetchBlocksMetadataRaw(req); err != nil {
+func (p *NodeClient) FetchBlocksRaw(req *FetchBlocksRawRequest) (r *FetchBlocksRawResult_, err error) {
+	if err = p.sendFetchBlocksRaw(req); err != nil {
 		return
 	}
-	return p.recvFetchBlocksMetadataRaw()
+	return p.recvFetchBlocksRaw()
 }
 
-func (p *NodeClient) sendFetchBlocksMetadataRaw(req *FetchBlocksMetadataRawRequest) (err error) {
+func (p *NodeClient) sendFetchBlocksRaw(req *FetchBlocksRawRequest) (err error) {
 	oprot := p.OutputProtocol
 	if oprot == nil {
 		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
 		p.OutputProtocol = oprot
 	}
 	p.SeqId++
-	if err = oprot.WriteMessageBegin("fetchBlocksMetadataRaw", thrift.CALL, p.SeqId); err != nil {
+	if err = oprot.WriteMessageBegin("fetchBlocksRaw", thrift.CALL, p.SeqId); err != nil {
 		return
 	}
-	args := NodeFetchBlocksMetadataRawArgs{
+	args := NodeFetchBlocksRawArgs{
 		Req: req,
 	}
 	if err = args.Write(oprot); err != nil {
@@ -11213,7 +10032,7 @@ func (p *NodeClient) sendFetchBlocksMetadataRaw(req *FetchBlocksMetadataRawReque
 	return oprot.Flush()
 }
 
-func (p *NodeClient) recvFetchBlocksMetadataRaw() (value *FetchBlocksMetadataRawResult_, err error) {
+func (p *NodeClient) recvFetchBlocksRaw() (value *FetchBlocksRawResult_, err error) {
 	iprot := p.InputProtocol
 	if iprot == nil {
 		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
@@ -11223,32 +10042,32 @@ func (p *NodeClient) recvFetchBlocksMetadataRaw() (value *FetchBlocksMetadataRaw
 	if err != nil {
 		return
 	}
-	if method != "fetchBlocksMetadataRaw" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "fetchBlocksMetadataRaw failed: wrong method name")
+	if method != "fetchBlocksRaw" {
+		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "fetchBlocksRaw failed: wrong method name")
 		return
 	}
 	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "fetchBlocksMetadataRaw failed: out of sequence response")
+		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "fetchBlocksRaw failed: out of sequence response")
 		return
 	}
 	if mTypeId == thrift.EXCEPTION {
-		error37 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error38 error
-		error38, err = error37.Read(iprot)
+		error33 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
+		var error34 error
+		error34, err = error33.Read(iprot)
 		if err != nil {
 			return
 		}
 		if err = iprot.ReadMessageEnd(); err != nil {
 			return
 		}
-		err = error38
+		err = error34
 		return
 	}
 	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "fetchBlocksMetadataRaw failed: invalid message type")
+		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "fetchBlocksRaw failed: invalid message type")
 		return
 	}
-	result := NodeFetchBlocksMetadataRawResult{}
+	result := NodeFetchBlocksRawResult{}
 	if err = result.Read(iprot); err != nil {
 		return
 	}
@@ -11313,16 +10132,16 @@ func (p *NodeClient) recvFetchBlocksMetadataRawV2() (value *FetchBlocksMetadataR
 		return
 	}
 	if mTypeId == thrift.EXCEPTION {
-		error39 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error40 error
-		error40, err = error39.Read(iprot)
+		error35 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
+		var error36 error
+		error36, err = error35.Read(iprot)
 		if err != nil {
 			return
 		}
 		if err = iprot.ReadMessageEnd(); err != nil {
 			return
 		}
-		err = error40
+		err = error36
 		return
 	}
 	if mTypeId != thrift.REPLY {
@@ -11394,16 +10213,16 @@ func (p *NodeClient) recvWriteBatchRaw() (err error) {
 		return
 	}
 	if mTypeId == thrift.EXCEPTION {
-		error41 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error42 error
-		error42, err = error41.Read(iprot)
+		error37 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
+		var error38 error
+		error38, err = error37.Read(iprot)
 		if err != nil {
 			return
 		}
 		if err = iprot.ReadMessageEnd(); err != nil {
 			return
 		}
-		err = error42
+		err = error38
 		return
 	}
 	if mTypeId != thrift.REPLY {
@@ -11474,16 +10293,16 @@ func (p *NodeClient) recvWriteTaggedBatchRaw() (err error) {
 		return
 	}
 	if mTypeId == thrift.EXCEPTION {
-		error43 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error44 error
-		error44, err = error43.Read(iprot)
+		error39 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
+		var error40 error
+		error40, err = error39.Read(iprot)
 		if err != nil {
 			return
 		}
 		if err = iprot.ReadMessageEnd(); err != nil {
 			return
 		}
-		err = error44
+		err = error40
 		return
 	}
 	if mTypeId != thrift.REPLY {
@@ -11550,16 +10369,16 @@ func (p *NodeClient) recvRepair() (err error) {
 		return
 	}
 	if mTypeId == thrift.EXCEPTION {
-		error45 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error46 error
-		error46, err = error45.Read(iprot)
+		error41 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
+		var error42 error
+		error42, err = error41.Read(iprot)
 		if err != nil {
 			return
 		}
 		if err = iprot.ReadMessageEnd(); err != nil {
 			return
 		}
-		err = error46
+		err = error42
 		return
 	}
 	if mTypeId != thrift.REPLY {
@@ -11630,16 +10449,16 @@ func (p *NodeClient) recvTruncate() (value *TruncateResult_, err error) {
 		return
 	}
 	if mTypeId == thrift.EXCEPTION {
-		error47 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error48 error
-		error48, err = error47.Read(iprot)
+		error43 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
+		var error44 error
+		error44, err = error43.Read(iprot)
 		if err != nil {
 			return
 		}
 		if err = iprot.ReadMessageEnd(); err != nil {
 			return
 		}
-		err = error48
+		err = error44
 		return
 	}
 	if mTypeId != thrift.REPLY {
@@ -11707,16 +10526,16 @@ func (p *NodeClient) recvHealth() (value *NodeHealthResult_, err error) {
 		return
 	}
 	if mTypeId == thrift.EXCEPTION {
-		error49 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error50 error
-		error50, err = error49.Read(iprot)
+		error45 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
+		var error46 error
+		error46, err = error45.Read(iprot)
 		if err != nil {
 			return
 		}
 		if err = iprot.ReadMessageEnd(); err != nil {
 			return
 		}
-		err = error50
+		err = error46
 		return
 	}
 	if mTypeId != thrift.REPLY {
@@ -11784,16 +10603,16 @@ func (p *NodeClient) recvBootstrapped() (value *NodeBootstrappedResult_, err err
 		return
 	}
 	if mTypeId == thrift.EXCEPTION {
-		error51 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error52 error
-		error52, err = error51.Read(iprot)
+		error47 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
+		var error48 error
+		error48, err = error47.Read(iprot)
 		if err != nil {
 			return
 		}
 		if err = iprot.ReadMessageEnd(); err != nil {
 			return
 		}
-		err = error52
+		err = error48
 		return
 	}
 	if mTypeId != thrift.REPLY {
@@ -11861,16 +10680,16 @@ func (p *NodeClient) recvGetPersistRateLimit() (value *NodePersistRateLimitResul
 		return
 	}
 	if mTypeId == thrift.EXCEPTION {
-		error53 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error54 error
-		error54, err = error53.Read(iprot)
+		error49 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
+		var error50 error
+		error50, err = error49.Read(iprot)
 		if err != nil {
 			return
 		}
 		if err = iprot.ReadMessageEnd(); err != nil {
 			return
 		}
-		err = error54
+		err = error50
 		return
 	}
 	if mTypeId != thrift.REPLY {
@@ -11942,16 +10761,16 @@ func (p *NodeClient) recvSetPersistRateLimit() (value *NodePersistRateLimitResul
 		return
 	}
 	if mTypeId == thrift.EXCEPTION {
-		error55 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error56 error
-		error56, err = error55.Read(iprot)
+		error51 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
+		var error52 error
+		error52, err = error51.Read(iprot)
 		if err != nil {
 			return
 		}
 		if err = iprot.ReadMessageEnd(); err != nil {
 			return
 		}
-		err = error56
+		err = error52
 		return
 	}
 	if mTypeId != thrift.REPLY {
@@ -12019,16 +10838,16 @@ func (p *NodeClient) recvGetWriteNewSeriesAsync() (value *NodeWriteNewSeriesAsyn
 		return
 	}
 	if mTypeId == thrift.EXCEPTION {
-		error57 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error58 error
-		error58, err = error57.Read(iprot)
+		error53 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
+		var error54 error
+		error54, err = error53.Read(iprot)
 		if err != nil {
 			return
 		}
 		if err = iprot.ReadMessageEnd(); err != nil {
 			return
 		}
-		err = error58
+		err = error54
 		return
 	}
 	if mTypeId != thrift.REPLY {
@@ -12100,16 +10919,16 @@ func (p *NodeClient) recvSetWriteNewSeriesAsync() (value *NodeWriteNewSeriesAsyn
 		return
 	}
 	if mTypeId == thrift.EXCEPTION {
-		error59 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error60 error
-		error60, err = error59.Read(iprot)
+		error55 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
+		var error56 error
+		error56, err = error55.Read(iprot)
 		if err != nil {
 			return
 		}
 		if err = iprot.ReadMessageEnd(); err != nil {
 			return
 		}
-		err = error60
+		err = error56
 		return
 	}
 	if mTypeId != thrift.REPLY {
@@ -12177,16 +10996,16 @@ func (p *NodeClient) recvGetWriteNewSeriesBackoffDuration() (value *NodeWriteNew
 		return
 	}
 	if mTypeId == thrift.EXCEPTION {
-		error61 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error62 error
-		error62, err = error61.Read(iprot)
+		error57 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
+		var error58 error
+		error58, err = error57.Read(iprot)
 		if err != nil {
 			return
 		}
 		if err = iprot.ReadMessageEnd(); err != nil {
 			return
 		}
-		err = error62
+		err = error58
 		return
 	}
 	if mTypeId != thrift.REPLY {
@@ -12258,16 +11077,16 @@ func (p *NodeClient) recvSetWriteNewSeriesBackoffDuration() (value *NodeWriteNew
 		return
 	}
 	if mTypeId == thrift.EXCEPTION {
-		error63 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error64 error
-		error64, err = error63.Read(iprot)
+		error59 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
+		var error60 error
+		error60, err = error59.Read(iprot)
 		if err != nil {
 			return
 		}
 		if err = iprot.ReadMessageEnd(); err != nil {
 			return
 		}
-		err = error64
+		err = error60
 		return
 	}
 	if mTypeId != thrift.REPLY {
@@ -12335,16 +11154,16 @@ func (p *NodeClient) recvGetWriteNewSeriesLimitPerShardPerSecond() (value *NodeW
 		return
 	}
 	if mTypeId == thrift.EXCEPTION {
-		error65 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error66 error
-		error66, err = error65.Read(iprot)
+		error61 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
+		var error62 error
+		error62, err = error61.Read(iprot)
 		if err != nil {
 			return
 		}
 		if err = iprot.ReadMessageEnd(); err != nil {
 			return
 		}
-		err = error66
+		err = error62
 		return
 	}
 	if mTypeId != thrift.REPLY {
@@ -12416,16 +11235,16 @@ func (p *NodeClient) recvSetWriteNewSeriesLimitPerShardPerSecond() (value *NodeW
 		return
 	}
 	if mTypeId == thrift.EXCEPTION {
-		error67 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error68 error
-		error68, err = error67.Read(iprot)
+		error63 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
+		var error64 error
+		error64, err = error63.Read(iprot)
 		if err != nil {
 			return
 		}
 		if err = iprot.ReadMessageEnd(); err != nil {
 			return
 		}
-		err = error68
+		err = error64
 		return
 	}
 	if mTypeId != thrift.REPLY {
@@ -12467,31 +11286,30 @@ func (p *NodeProcessor) ProcessorMap() map[string]thrift.TProcessorFunction {
 
 func NewNodeProcessor(handler Node) *NodeProcessor {
 
-	self69 := &NodeProcessor{handler: handler, processorMap: make(map[string]thrift.TProcessorFunction)}
-	self69.processorMap["query"] = &nodeProcessorQuery{handler: handler}
-	self69.processorMap["fetch"] = &nodeProcessorFetch{handler: handler}
-	self69.processorMap["fetchTagged"] = &nodeProcessorFetchTagged{handler: handler}
-	self69.processorMap["write"] = &nodeProcessorWrite{handler: handler}
-	self69.processorMap["writeTagged"] = &nodeProcessorWriteTagged{handler: handler}
-	self69.processorMap["fetchBatchRaw"] = &nodeProcessorFetchBatchRaw{handler: handler}
-	self69.processorMap["fetchBlocksRaw"] = &nodeProcessorFetchBlocksRaw{handler: handler}
-	self69.processorMap["fetchBlocksMetadataRaw"] = &nodeProcessorFetchBlocksMetadataRaw{handler: handler}
-	self69.processorMap["fetchBlocksMetadataRawV2"] = &nodeProcessorFetchBlocksMetadataRawV2{handler: handler}
-	self69.processorMap["writeBatchRaw"] = &nodeProcessorWriteBatchRaw{handler: handler}
-	self69.processorMap["writeTaggedBatchRaw"] = &nodeProcessorWriteTaggedBatchRaw{handler: handler}
-	self69.processorMap["repair"] = &nodeProcessorRepair{handler: handler}
-	self69.processorMap["truncate"] = &nodeProcessorTruncate{handler: handler}
-	self69.processorMap["health"] = &nodeProcessorHealth{handler: handler}
-	self69.processorMap["bootstrapped"] = &nodeProcessorBootstrapped{handler: handler}
-	self69.processorMap["getPersistRateLimit"] = &nodeProcessorGetPersistRateLimit{handler: handler}
-	self69.processorMap["setPersistRateLimit"] = &nodeProcessorSetPersistRateLimit{handler: handler}
-	self69.processorMap["getWriteNewSeriesAsync"] = &nodeProcessorGetWriteNewSeriesAsync{handler: handler}
-	self69.processorMap["setWriteNewSeriesAsync"] = &nodeProcessorSetWriteNewSeriesAsync{handler: handler}
-	self69.processorMap["getWriteNewSeriesBackoffDuration"] = &nodeProcessorGetWriteNewSeriesBackoffDuration{handler: handler}
-	self69.processorMap["setWriteNewSeriesBackoffDuration"] = &nodeProcessorSetWriteNewSeriesBackoffDuration{handler: handler}
-	self69.processorMap["getWriteNewSeriesLimitPerShardPerSecond"] = &nodeProcessorGetWriteNewSeriesLimitPerShardPerSecond{handler: handler}
-	self69.processorMap["setWriteNewSeriesLimitPerShardPerSecond"] = &nodeProcessorSetWriteNewSeriesLimitPerShardPerSecond{handler: handler}
-	return self69
+	self65 := &NodeProcessor{handler: handler, processorMap: make(map[string]thrift.TProcessorFunction)}
+	self65.processorMap["query"] = &nodeProcessorQuery{handler: handler}
+	self65.processorMap["fetch"] = &nodeProcessorFetch{handler: handler}
+	self65.processorMap["fetchTagged"] = &nodeProcessorFetchTagged{handler: handler}
+	self65.processorMap["write"] = &nodeProcessorWrite{handler: handler}
+	self65.processorMap["writeTagged"] = &nodeProcessorWriteTagged{handler: handler}
+	self65.processorMap["fetchBatchRaw"] = &nodeProcessorFetchBatchRaw{handler: handler}
+	self65.processorMap["fetchBlocksRaw"] = &nodeProcessorFetchBlocksRaw{handler: handler}
+	self65.processorMap["fetchBlocksMetadataRawV2"] = &nodeProcessorFetchBlocksMetadataRawV2{handler: handler}
+	self65.processorMap["writeBatchRaw"] = &nodeProcessorWriteBatchRaw{handler: handler}
+	self65.processorMap["writeTaggedBatchRaw"] = &nodeProcessorWriteTaggedBatchRaw{handler: handler}
+	self65.processorMap["repair"] = &nodeProcessorRepair{handler: handler}
+	self65.processorMap["truncate"] = &nodeProcessorTruncate{handler: handler}
+	self65.processorMap["health"] = &nodeProcessorHealth{handler: handler}
+	self65.processorMap["bootstrapped"] = &nodeProcessorBootstrapped{handler: handler}
+	self65.processorMap["getPersistRateLimit"] = &nodeProcessorGetPersistRateLimit{handler: handler}
+	self65.processorMap["setPersistRateLimit"] = &nodeProcessorSetPersistRateLimit{handler: handler}
+	self65.processorMap["getWriteNewSeriesAsync"] = &nodeProcessorGetWriteNewSeriesAsync{handler: handler}
+	self65.processorMap["setWriteNewSeriesAsync"] = &nodeProcessorSetWriteNewSeriesAsync{handler: handler}
+	self65.processorMap["getWriteNewSeriesBackoffDuration"] = &nodeProcessorGetWriteNewSeriesBackoffDuration{handler: handler}
+	self65.processorMap["setWriteNewSeriesBackoffDuration"] = &nodeProcessorSetWriteNewSeriesBackoffDuration{handler: handler}
+	self65.processorMap["getWriteNewSeriesLimitPerShardPerSecond"] = &nodeProcessorGetWriteNewSeriesLimitPerShardPerSecond{handler: handler}
+	self65.processorMap["setWriteNewSeriesLimitPerShardPerSecond"] = &nodeProcessorSetWriteNewSeriesLimitPerShardPerSecond{handler: handler}
+	return self65
 }
 
 func (p *NodeProcessor) Process(iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
@@ -12504,12 +11322,12 @@ func (p *NodeProcessor) Process(iprot, oprot thrift.TProtocol) (success bool, er
 	}
 	iprot.Skip(thrift.STRUCT)
 	iprot.ReadMessageEnd()
-	x70 := thrift.NewTApplicationException(thrift.UNKNOWN_METHOD, "Unknown function "+name)
+	x66 := thrift.NewTApplicationException(thrift.UNKNOWN_METHOD, "Unknown function "+name)
 	oprot.WriteMessageBegin(name, thrift.EXCEPTION, seqId)
-	x70.Write(oprot)
+	x66.Write(oprot)
 	oprot.WriteMessageEnd()
 	oprot.Flush()
-	return false, x70
+	return false, x66
 
 }
 
@@ -12776,65 +11594,12 @@ type nodeProcessorFetchBatchRaw struct {
 	handler Node
 }
 
-func (p *nodeProcessorFetchBatchRaw) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	args := NodeFetchBatchRawArgs{}
-	if err = args.Read(iprot); err != nil {
-		iprot.ReadMessageEnd()
-		x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
-		oprot.WriteMessageBegin("fetchBatchRaw", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return false, err
-	}
-
-	iprot.ReadMessageEnd()
-	result := NodeFetchBatchRawResult{}
-	var retval *FetchBatchRawResult_
-	var err2 error
-	if retval, err2 = p.handler.FetchBatchRaw(args.Req); err2 != nil {
-		switch v := err2.(type) {
-		case *Error:
-			result.Err = v
-		default:
-			x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing fetchBatchRaw: "+err2.Error())
-			oprot.WriteMessageBegin("fetchBatchRaw", thrift.EXCEPTION, seqId)
-			x.Write(oprot)
-			oprot.WriteMessageEnd()
-			oprot.Flush()
-			return true, err2
-		}
-	} else {
-		result.Success = retval
-	}
-	if err2 = oprot.WriteMessageBegin("fetchBatchRaw", thrift.REPLY, seqId); err2 != nil {
-		err = err2
-	}
-	if err2 = result.Write(oprot); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.Flush(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err != nil {
-		return
-	}
-	return true, err
-}
-
-type nodeProcessorFetchBlocksRaw struct {
-	handler Node
-}
-
-func (p *nodeProcessorFetchBlocksRaw) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	args := NodeFetchBlocksRawArgs{}
+func (p *nodeProcessorFetchBatchRaw) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
+	args := NodeFetchBatchRawArgs{}
 	if err = args.Read(iprot); err != nil {
 		iprot.ReadMessageEnd()
 		x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
-		oprot.WriteMessageBegin("fetchBlocksRaw", thrift.EXCEPTION, seqId)
+		oprot.WriteMessageBegin("fetchBatchRaw", thrift.EXCEPTION, seqId)
 		x.Write(oprot)
 		oprot.WriteMessageEnd()
 		oprot.Flush()
@@ -12842,16 +11607,16 @@ func (p *nodeProcessorFetchBlocksRaw) Process(seqId int32, iprot, oprot thrift.T
 	}
 
 	iprot.ReadMessageEnd()
-	result := NodeFetchBlocksRawResult{}
-	var retval *FetchBlocksRawResult_
+	result := NodeFetchBatchRawResult{}
+	var retval *FetchBatchRawResult_
 	var err2 error
-	if retval, err2 = p.handler.FetchBlocksRaw(args.Req); err2 != nil {
+	if retval, err2 = p.handler.FetchBatchRaw(args.Req); err2 != nil {
 		switch v := err2.(type) {
 		case *Error:
 			result.Err = v
 		default:
-			x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing fetchBlocksRaw: "+err2.Error())
-			oprot.WriteMessageBegin("fetchBlocksRaw", thrift.EXCEPTION, seqId)
+			x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing fetchBatchRaw: "+err2.Error())
+			oprot.WriteMessageBegin("fetchBatchRaw", thrift.EXCEPTION, seqId)
 			x.Write(oprot)
 			oprot.WriteMessageEnd()
 			oprot.Flush()
@@ -12860,7 +11625,7 @@ func (p *nodeProcessorFetchBlocksRaw) Process(seqId int32, iprot, oprot thrift.T
 	} else {
 		result.Success = retval
 	}
-	if err2 = oprot.WriteMessageBegin("fetchBlocksRaw", thrift.REPLY, seqId); err2 != nil {
+	if err2 = oprot.WriteMessageBegin("fetchBatchRaw", thrift.REPLY, seqId); err2 != nil {
 		err = err2
 	}
 	if err2 = result.Write(oprot); err == nil && err2 != nil {
@@ -12878,16 +11643,16 @@ func (p *nodeProcessorFetchBlocksRaw) Process(seqId int32, iprot, oprot thrift.T
 	return true, err
 }
 
-type nodeProcessorFetchBlocksMetadataRaw struct {
+type nodeProcessorFetchBlocksRaw struct {
 	handler Node
 }
 
-func (p *nodeProcessorFetchBlocksMetadataRaw) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	args := NodeFetchBlocksMetadataRawArgs{}
+func (p *nodeProcessorFetchBlocksRaw) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
+	args := NodeFetchBlocksRawArgs{}
 	if err = args.Read(iprot); err != nil {
 		iprot.ReadMessageEnd()
 		x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
-		oprot.WriteMessageBegin("fetchBlocksMetadataRaw", thrift.EXCEPTION, seqId)
+		oprot.WriteMessageBegin("fetchBlocksRaw", thrift.EXCEPTION, seqId)
 		x.Write(oprot)
 		oprot.WriteMessageEnd()
 		oprot.Flush()
@@ -12895,16 +11660,16 @@ func (p *nodeProcessorFetchBlocksMetadataRaw) Process(seqId int32, iprot, oprot
 	}
 
 	iprot.ReadMessageEnd()
-	result := NodeFetchBlocksMetadataRawResult{}
-	var retval *FetchBlocksMetadataRawResult_
+	result := NodeFetchBlocksRawResult{}
+	var retval *FetchBlocksRawResult_
 	var err2 error
-	if retval, err2 = p.handler.FetchBlocksMetadataRaw(args.Req); err2 != nil {
+	if retval, err2 = p.handler.FetchBlocksRaw(args.Req); err2 != nil {
 		switch v := err2.(type) {
 		case *Error:
 			result.Err = v
 		default:
-			x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing fetchBlocksMetadataRaw: "+err2.Error())
-			oprot.WriteMessageBegin("fetchBlocksMetadataRaw", thrift.EXCEPTION, seqId)
+			x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing fetchBlocksRaw: "+err2.Error())
+			oprot.WriteMessageBegin("fetchBlocksRaw", thrift.EXCEPTION, seqId)
 			x.Write(oprot)
 			oprot.WriteMessageEnd()
 			oprot.Flush()
@@ -12913,7 +11678,7 @@ func (p *nodeProcessorFetchBlocksMetadataRaw) Process(seqId int32, iprot, oprot
 	} else {
 		result.Success = retval
 	}
-	if err2 = oprot.WriteMessageBegin("fetchBlocksMetadataRaw", thrift.REPLY, seqId); err2 != nil {
+	if err2 = oprot.WriteMessageBegin("fetchBlocksRaw", thrift.REPLY, seqId); err2 != nil {
 		err = err2
 	}
 	if err2 = result.Write(oprot); err == nil && err2 != nil {
@@ -15398,257 +14163,6 @@ func (p *NodeFetchBlocksRawResult) String() string {
 	return fmt.Sprintf("NodeFetchBlocksRawResult(%+v)", *p)
 }
 
-// Attributes:
-//  - Req
-type NodeFetchBlocksMetadataRawArgs struct {
-	Req *FetchBlocksMetadataRawRequest `thrift:"req,1" db:"req" json:"req"`
-}
-
-func NewNodeFetchBlocksMetadataRawArgs() *NodeFetchBlocksMetadataRawArgs {
-	return &NodeFetchBlocksMetadataRawArgs{}
-}
-
-var NodeFetchBlocksMetadataRawArgs_Req_DEFAULT *FetchBlocksMetadataRawRequest
-
-func (p *NodeFetchBlocksMetadataRawArgs) GetReq() *FetchBlocksMetadataRawRequest {
-	if !p.IsSetReq() {
-		return NodeFetchBlocksMetadataRawArgs_Req_DEFAULT
-	}
-	return p.Req
-}
-func (p *NodeFetchBlocksMetadataRawArgs) IsSetReq() bool {
-	return p.Req != nil
-}
-
-func (p *NodeFetchBlocksMetadataRawArgs) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.ReadField1(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *NodeFetchBlocksMetadataRawArgs) ReadField1(iprot thrift.TProtocol) error {
-	p.Req = &FetchBlocksMetadataRawRequest{}
-	if err := p.Req.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Req), err)
-	}
-	return nil
-}
-
-func (p *NodeFetchBlocksMetadataRawArgs) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("fetchBlocksMetadataRaw_args"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if p != nil {
-		if err := p.writeField1(oprot); err != nil {
-			return err
-		}
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *NodeFetchBlocksMetadataRawArgs) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("req", thrift.STRUCT, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:req: ", p), err)
-	}
-	if err := p.Req.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Req), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:req: ", p), err)
-	}
-	return err
-}
-
-func (p *NodeFetchBlocksMetadataRawArgs) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("NodeFetchBlocksMetadataRawArgs(%+v)", *p)
-}
-
-// Attributes:
-//  - Success
-//  - Err
-type NodeFetchBlocksMetadataRawResult struct {
-	Success *FetchBlocksMetadataRawResult_ `thrift:"success,0" db:"success" json:"success,omitempty"`
-	Err     *Error                         `thrift:"err,1" db:"err" json:"err,omitempty"`
-}
-
-func NewNodeFetchBlocksMetadataRawResult() *NodeFetchBlocksMetadataRawResult {
-	return &NodeFetchBlocksMetadataRawResult{}
-}
-
-var NodeFetchBlocksMetadataRawResult_Success_DEFAULT *FetchBlocksMetadataRawResult_
-
-func (p *NodeFetchBlocksMetadataRawResult) GetSuccess() *FetchBlocksMetadataRawResult_ {
-	if !p.IsSetSuccess() {
-		return NodeFetchBlocksMetadataRawResult_Success_DEFAULT
-	}
-	return p.Success
-}
-
-var NodeFetchBlocksMetadataRawResult_Err_DEFAULT *Error
-
-func (p *NodeFetchBlocksMetadataRawResult) GetErr() *Error {
-	if !p.IsSetErr() {
-		return NodeFetchBlocksMetadataRawResult_Err_DEFAULT
-	}
-	return p.Err
-}
-func (p *NodeFetchBlocksMetadataRawResult) IsSetSuccess() bool {
-	return p.Success != nil
-}
-
-func (p *NodeFetchBlocksMetadataRawResult) IsSetErr() bool {
-	return p.Err != nil
-}
-
-func (p *NodeFetchBlocksMetadataRawResult) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 0:
-			if err := p.ReadField0(iprot); err != nil {
-				return err
-			}
-		case 1:
-			if err := p.ReadField1(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *NodeFetchBlocksMetadataRawResult) ReadField0(iprot thrift.TProtocol) error {
-	p.Success = &FetchBlocksMetadataRawResult_{}
-	if err := p.Success.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
-	}
-	return nil
-}
-
-func (p *NodeFetchBlocksMetadataRawResult) ReadField1(iprot thrift.TProtocol) error {
-	p.Err = &Error{
-		Type: 0,
-	}
-	if err := p.Err.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Err), err)
-	}
-	return nil
-}
-
-func (p *NodeFetchBlocksMetadataRawResult) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("fetchBlocksMetadataRaw_result"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if p != nil {
-		if err := p.writeField0(oprot); err != nil {
-			return err
-		}
-		if err := p.writeField1(oprot); err != nil {
-			return err
-		}
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *NodeFetchBlocksMetadataRawResult) writeField0(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSuccess() {
-		if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err)
-		}
-		if err := p.Success.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *NodeFetchBlocksMetadataRawResult) writeField1(oprot thrift.TProtocol) (err error) {
-	if p.IsSetErr() {
-		if err := oprot.WriteFieldBegin("err", thrift.STRUCT, 1); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:err: ", p), err)
-		}
-		if err := p.Err.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Err), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 1:err: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *NodeFetchBlocksMetadataRawResult) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("NodeFetchBlocksMetadataRawResult(%+v)", *p)
-}
-
 // Attributes:
 //  - Req
 type NodeFetchBlocksMetadataRawV2Args struct {
@@ -19049,16 +17563,16 @@ func (p *ClusterClient) recvHealth() (value *HealthResult_, err error) {
 		return
 	}
 	if mTypeId == thrift.EXCEPTION {
-		error167 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error168 error
-		error168, err = error167.Read(iprot)
+		error157 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
+		var error158 error
+		error158, err = error157.Read(iprot)
 		if err != nil {
 			return
 		}
 		if err = iprot.ReadMessageEnd(); err != nil {
 			return
 		}
-		err = error168
+		err = error158
 		return
 	}
 	if mTypeId != thrift.REPLY {
@@ -19130,16 +17644,16 @@ func (p *ClusterClient) recvWrite() (err error) {
 		return
 	}
 	if mTypeId == thrift.EXCEPTION {
-		error169 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error170 error
-		error170, err = error169.Read(iprot)
+		error159 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
+		var error160 error
+		error160, err = error159.Read(iprot)
 		if err != nil {
 			return
 		}
 		if err = iprot.ReadMessageEnd(); err != nil {
 			return
 		}
-		err = error170
+		err = error160
 		return
 	}
 	if mTypeId != thrift.REPLY {
@@ -19210,16 +17724,16 @@ func (p *ClusterClient) recvWriteTagged() (err error) {
 		return
 	}
 	if mTypeId == thrift.EXCEPTION {
-		error171 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error172 error
-		error172, err = error171.Read(iprot)
+		error161 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
+		var error162 error
+		error162, err = error161.Read(iprot)
 		if err != nil {
 			return
 		}
 		if err = iprot.ReadMessageEnd(); err != nil {
 			return
 		}
-		err = error172
+		err = error162
 		return
 	}
 	if mTypeId != thrift.REPLY {
@@ -19290,16 +17804,16 @@ func (p *ClusterClient) recvQuery() (value *QueryResult_, err error) {
 		return
 	}
 	if mTypeId == thrift.EXCEPTION {
-		error173 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error174 error
-		error174, err = error173.Read(iprot)
+		error163 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
+		var error164 error
+		error164, err = error163.Read(iprot)
 		if err != nil {
 			return
 		}
 		if err = iprot.ReadMessageEnd(); err != nil {
 			return
 		}
-		err = error174
+		err = error164
 		return
 	}
 	if mTypeId != thrift.REPLY {
@@ -19371,16 +17885,16 @@ func (p *ClusterClient) recvFetch() (value *FetchResult_, err error) {
 		return
 	}
 	if mTypeId == thrift.EXCEPTION {
-		error175 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error176 error
-		error176, err = error175.Read(iprot)
+		error165 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
+		var error166 error
+		error166, err = error165.Read(iprot)
 		if err != nil {
 			return
 		}
 		if err = iprot.ReadMessageEnd(); err != nil {
 			return
 		}
-		err = error176
+		err = error166
 		return
 	}
 	if mTypeId != thrift.REPLY {
@@ -19452,16 +17966,16 @@ func (p *ClusterClient) recvFetchTagged() (value *FetchTaggedResult_, err error)
 		return
 	}
 	if mTypeId == thrift.EXCEPTION {
-		error177 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error178 error
-		error178, err = error177.Read(iprot)
+		error167 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
+		var error168 error
+		error168, err = error167.Read(iprot)
 		if err != nil {
 			return
 		}
 		if err = iprot.ReadMessageEnd(); err != nil {
 			return
 		}
-		err = error178
+		err = error168
 		return
 	}
 	if mTypeId != thrift.REPLY {
@@ -19533,16 +18047,16 @@ func (p *ClusterClient) recvTruncate() (value *TruncateResult_, err error) {
 		return
 	}
 	if mTypeId == thrift.EXCEPTION {
-		error179 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error180 error
-		error180, err = error179.Read(iprot)
+		error169 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
+		var error170 error
+		error170, err = error169.Read(iprot)
 		if err != nil {
 			return
 		}
 		if err = iprot.ReadMessageEnd(); err != nil {
 			return
 		}
-		err = error180
+		err = error170
 		return
 	}
 	if mTypeId != thrift.REPLY {
@@ -19584,15 +18098,15 @@ func (p *ClusterProcessor) ProcessorMap() map[string]thrift.TProcessorFunction {
 
 func NewClusterProcessor(handler Cluster) *ClusterProcessor {
 
-	self181 := &ClusterProcessor{handler: handler, processorMap: make(map[string]thrift.TProcessorFunction)}
-	self181.processorMap["health"] = &clusterProcessorHealth{handler: handler}
-	self181.processorMap["write"] = &clusterProcessorWrite{handler: handler}
-	self181.processorMap["writeTagged"] = &clusterProcessorWriteTagged{handler: handler}
-	self181.processorMap["query"] = &clusterProcessorQuery{handler: handler}
-	self181.processorMap["fetch"] = &clusterProcessorFetch{handler: handler}
-	self181.processorMap["fetchTagged"] = &clusterProcessorFetchTagged{handler: handler}
-	self181.processorMap["truncate"] = &clusterProcessorTruncate{handler: handler}
-	return self181
+	self171 := &ClusterProcessor{handler: handler, processorMap: make(map[string]thrift.TProcessorFunction)}
+	self171.processorMap["health"] = &clusterProcessorHealth{handler: handler}
+	self171.processorMap["write"] = &clusterProcessorWrite{handler: handler}
+	self171.processorMap["writeTagged"] = &clusterProcessorWriteTagged{handler: handler}
+	self171.processorMap["query"] = &clusterProcessorQuery{handler: handler}
+	self171.processorMap["fetch"] = &clusterProcessorFetch{handler: handler}
+	self171.processorMap["fetchTagged"] = &clusterProcessorFetchTagged{handler: handler}
+	self171.processorMap["truncate"] = &clusterProcessorTruncate{handler: handler}
+	return self171
 }
 
 func (p *ClusterProcessor) Process(iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
@@ -19605,12 +18119,12 @@ func (p *ClusterProcessor) Process(iprot, oprot thrift.TProtocol) (success bool,
 	}
 	iprot.Skip(thrift.STRUCT)
 	iprot.ReadMessageEnd()
-	x182 := thrift.NewTApplicationException(thrift.UNKNOWN_METHOD, "Unknown function "+name)
+	x172 := thrift.NewTApplicationException(thrift.UNKNOWN_METHOD, "Unknown function "+name)
 	oprot.WriteMessageBegin(name, thrift.EXCEPTION, seqId)
-	x182.Write(oprot)
+	x172.Write(oprot)
 	oprot.WriteMessageEnd()
 	oprot.Flush()
-	return false, x182
+	return false, x172
 
 }
 
diff --git a/src/dbnode/generated/thrift/rpc/rpc_mock.go b/src/dbnode/generated/thrift/rpc/rpc_mock.go
index 7c72399b89..4a79ba6b57 100644
--- a/src/dbnode/generated/thrift/rpc/rpc_mock.go
+++ b/src/dbnode/generated/thrift/rpc/rpc_mock.go
@@ -205,19 +205,6 @@ func (mr *MockTChanNodeMockRecorder) FetchBatchRaw(ctx, req interface{}) *gomock
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FetchBatchRaw", reflect.TypeOf((*MockTChanNode)(nil).FetchBatchRaw), ctx, req)
 }
 
-// FetchBlocksMetadataRaw mocks base method
-func (m *MockTChanNode) FetchBlocksMetadataRaw(ctx thrift.Context, req *FetchBlocksMetadataRawRequest) (*FetchBlocksMetadataRawResult_, error) {
-	ret := m.ctrl.Call(m, "FetchBlocksMetadataRaw", ctx, req)
-	ret0, _ := ret[0].(*FetchBlocksMetadataRawResult_)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// FetchBlocksMetadataRaw indicates an expected call of FetchBlocksMetadataRaw
-func (mr *MockTChanNodeMockRecorder) FetchBlocksMetadataRaw(ctx, req interface{}) *gomock.Call {
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FetchBlocksMetadataRaw", reflect.TypeOf((*MockTChanNode)(nil).FetchBlocksMetadataRaw), ctx, req)
-}
-
 // FetchBlocksMetadataRawV2 mocks base method
 func (m *MockTChanNode) FetchBlocksMetadataRawV2(ctx thrift.Context, req *FetchBlocksMetadataRawV2Request) (*FetchBlocksMetadataRawV2Result_, error) {
 	ret := m.ctrl.Call(m, "FetchBlocksMetadataRawV2", ctx, req)
diff --git a/src/dbnode/generated/thrift/rpc/tchan-rpc.go b/src/dbnode/generated/thrift/rpc/tchan-rpc.go
index 0e40823ea4..97b4a44db2 100644
--- a/src/dbnode/generated/thrift/rpc/tchan-rpc.go
+++ b/src/dbnode/generated/thrift/rpc/tchan-rpc.go
@@ -48,7 +48,6 @@ type TChanNode interface {
 	Bootstrapped(ctx thrift.Context) (*NodeBootstrappedResult_, error)
 	Fetch(ctx thrift.Context, req *FetchRequest) (*FetchResult_, error)
 	FetchBatchRaw(ctx thrift.Context, req *FetchBatchRawRequest) (*FetchBatchRawResult_, error)
-	FetchBlocksMetadataRaw(ctx thrift.Context, req *FetchBlocksMetadataRawRequest) (*FetchBlocksMetadataRawResult_, error)
 	FetchBlocksMetadataRawV2(ctx thrift.Context, req *FetchBlocksMetadataRawV2Request) (*FetchBlocksMetadataRawV2Result_, error)
 	FetchBlocksRaw(ctx thrift.Context, req *FetchBlocksRawRequest) (*FetchBlocksRawResult_, error)
 	FetchTagged(ctx thrift.Context, req *FetchTaggedRequest) (*FetchTaggedResult_, error)
@@ -526,24 +525,6 @@ func (c *tchanNodeClient) FetchBatchRaw(ctx thrift.Context, req *FetchBatchRawRe
 	return resp.GetSuccess(), err
 }
 
-func (c *tchanNodeClient) FetchBlocksMetadataRaw(ctx thrift.Context, req *FetchBlocksMetadataRawRequest) (*FetchBlocksMetadataRawResult_, error) {
-	var resp NodeFetchBlocksMetadataRawResult
-	args := NodeFetchBlocksMetadataRawArgs{
-		Req: req,
-	}
-	success, err := c.client.Call(ctx, c.thriftService, "fetchBlocksMetadataRaw", &args, &resp)
-	if err == nil && !success {
-		switch {
-		case resp.Err != nil:
-			err = resp.Err
-		default:
-			err = fmt.Errorf("received no result or unknown exception for fetchBlocksMetadataRaw")
-		}
-	}
-
-	return resp.GetSuccess(), err
-}
-
 func (c *tchanNodeClient) FetchBlocksMetadataRawV2(ctx thrift.Context, req *FetchBlocksMetadataRawV2Request) (*FetchBlocksMetadataRawV2Result_, error) {
 	var resp NodeFetchBlocksMetadataRawV2Result
 	args := NodeFetchBlocksMetadataRawV2Args{
@@ -895,7 +876,6 @@ func (s *tchanNodeServer) Methods() []string {
 		"bootstrapped",
 		"fetch",
 		"fetchBatchRaw",
-		"fetchBlocksMetadataRaw",
 		"fetchBlocksMetadataRawV2",
 		"fetchBlocksRaw",
 		"fetchTagged",
@@ -926,8 +906,6 @@ func (s *tchanNodeServer) Handle(ctx thrift.Context, methodName string, protocol
 		return s.handleFetch(ctx, protocol)
 	case "fetchBatchRaw":
 		return s.handleFetchBatchRaw(ctx, protocol)
-	case "fetchBlocksMetadataRaw":
-		return s.handleFetchBlocksMetadataRaw(ctx, protocol)
 	case "fetchBlocksMetadataRawV2":
 		return s.handleFetchBlocksMetadataRawV2(ctx, protocol)
 	case "fetchBlocksRaw":
@@ -1056,34 +1034,6 @@ func (s *tchanNodeServer) handleFetchBatchRaw(ctx thrift.Context, protocol athri
 	return err == nil, &res, nil
 }
 
-func (s *tchanNodeServer) handleFetchBlocksMetadataRaw(ctx thrift.Context, protocol athrift.TProtocol) (bool, athrift.TStruct, error) {
-	var req NodeFetchBlocksMetadataRawArgs
-	var res NodeFetchBlocksMetadataRawResult
-
-	if err := req.Read(protocol); err != nil {
-		return false, nil, err
-	}
-
-	r, err :=
-		s.handler.FetchBlocksMetadataRaw(ctx, req.Req)
-
-	if err != nil {
-		switch v := err.(type) {
-		case *Error:
-			if v == nil {
-				return false, nil, fmt.Errorf("Handler for err returned non-nil error type *Error but nil value")
-			}
-			res.Err = v
-		default:
-			return false, nil, err
-		}
-	} else {
-		res.Success = r
-	}
-
-	return err == nil, &res, nil
-}
-
 func (s *tchanNodeServer) handleFetchBlocksMetadataRawV2(ctx thrift.Context, protocol athrift.TProtocol) (bool, athrift.TStruct, error) {
 	var req NodeFetchBlocksMetadataRawV2Args
 	var res NodeFetchBlocksMetadataRawV2Result
diff --git a/src/dbnode/integration/admin_session_fetch_blocks_test.go b/src/dbnode/integration/admin_session_fetch_blocks_test.go
index d51e997625..ce8a98de04 100644
--- a/src/dbnode/integration/admin_session_fetch_blocks_test.go
+++ b/src/dbnode/integration/admin_session_fetch_blocks_test.go
@@ -26,7 +26,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/m3db/m3/src/dbnode/client"
 	"github.com/m3db/m3/src/dbnode/integration/generate"
 	"github.com/m3db/m3/src/dbnode/storage/block"
 	"github.com/m3db/m3/src/dbnode/storage/namespace"
@@ -105,9 +104,8 @@ func testSetupMetadatas(
 	// FetchMetadataBlocksFromPeers/FetchBlocksFromPeers
 	adminClient := testSetup.m3dbVerificationAdminClient
 	level := topology.ReadConsistencyLevelMajority
-	version := client.FetchBlocksMetadataEndpointV2
 	metadatasByShard, err := m3dbClientFetchBlocksMetadata(adminClient,
-		namespace, testSetup.shardSet.AllIDs(), start, end, level, version)
+		namespace, testSetup.shardSet.AllIDs(), start, end, level)
 	require.NoError(t, err)
 	return metadatasByShard
 }
diff --git a/src/dbnode/integration/client.go b/src/dbnode/integration/client.go
index 3080309212..d238d47ac4 100644
--- a/src/dbnode/integration/client.go
+++ b/src/dbnode/integration/client.go
@@ -193,7 +193,6 @@ func m3dbClientFetchBlocksMetadata(
 	shards []uint32,
 	start, end time.Time,
 	consistencyLevel topology.ReadConsistencyLevel,
-	version client.FetchBlocksMetadataEndpointVersion,
 ) (map[uint32][]block.ReplicaMetadata, error) {
 	session, err := c.DefaultAdminSession()
 	if err != nil {
@@ -212,7 +211,7 @@ func m3dbClientFetchBlocksMetadata(
 
 		var metadatas []block.ReplicaMetadata
 		iter, err := session.FetchBlocksMetadataFromPeers(namespace,
-			shardID, start, end, consistencyLevel, result.NewOptions(), version)
+			shardID, start, end, consistencyLevel, result.NewOptions())
 		if err != nil {
 			return nil, err
 		}
diff --git a/src/dbnode/integration/integration.go b/src/dbnode/integration/integration.go
index ccfae4a8d7..3b0d913a8e 100644
--- a/src/dbnode/integration/integration.go
+++ b/src/dbnode/integration/integration.go
@@ -38,7 +38,6 @@ import (
 	"github.com/m3db/m3/src/dbnode/storage/bootstrap/bootstrapper/uninitialized"
 	"github.com/m3db/m3/src/dbnode/storage/bootstrap/result"
 	"github.com/m3db/m3/src/dbnode/storage/namespace"
-	"github.com/m3db/m3/src/dbnode/storage/series"
 	"github.com/m3db/m3/src/dbnode/topology"
 	"github.com/m3db/m3/src/dbnode/topology/testutil"
 	xmetrics "github.com/m3db/m3/src/dbnode/x/metrics"
@@ -107,15 +106,14 @@ func newMultiAddrAdminClient(
 }
 
 type bootstrappableTestSetupOptions struct {
-	finalBootstrapper                  string
-	fetchBlocksMetadataEndpointVersion client.FetchBlocksMetadataEndpointVersion
-	bootstrapBlocksBatchSize           int
-	bootstrapBlocksConcurrency         int
-	bootstrapConsistencyLevel          topology.ReadConsistencyLevel
-	topologyInitializer                topology.Initializer
-	testStatsReporter                  xmetrics.TestStatsReporter
-	disablePeersBootstrapper           bool
-	useTChannelClientForWriting        bool
+	finalBootstrapper           string
+	bootstrapBlocksBatchSize    int
+	bootstrapBlocksConcurrency  int
+	bootstrapConsistencyLevel   topology.ReadConsistencyLevel
+	topologyInitializer         topology.Initializer
+	testStatsReporter           xmetrics.TestStatsReporter
+	disablePeersBootstrapper    bool
+	useTChannelClientForWriting bool
 }
 
 type closeFn func()
@@ -146,17 +144,8 @@ func newDefaultBootstrappableTestSetups(
 			defer cleanupFnsMutex.Unlock()
 			cleanupFns = append(cleanupFns, fn)
 		}
-		anySetupUsingFetchBlocksMetadataEndpointV1 = false
 	)
 
-	for i := range setupOpts {
-		v1 := client.FetchBlocksMetadataEndpointV1
-		if setupOpts[i].fetchBlocksMetadataEndpointVersion == v1 {
-			anySetupUsingFetchBlocksMetadataEndpointV1 = true
-			break
-		}
-	}
-
 	shardSet, err := newTestShardSet(opts.NumShards())
 	require.NoError(t, err)
 	for i := 0; i < replicas; i++ {
@@ -213,12 +202,6 @@ func newDefaultBootstrappableTestSetups(
 		require.NoError(t, err)
 		topologyInitializer = setup.topoInit
 
-		// Force correct series cache policy if using V1 version
-		// TODO: Remove once v1 endpoint is gone
-		if anySetupUsingFetchBlocksMetadataEndpointV1 {
-			setup.storageOpts = setup.storageOpts.SetSeriesCachePolicy(series.CacheAll)
-		}
-
 		instrumentOpts := setup.storageOpts.InstrumentOptions()
 		logger := instrumentOpts.Logger()
 		logger = logger.WithFields(xlog.NewField("instance", instance))
@@ -278,7 +261,6 @@ func newDefaultBootstrappableTestSetups(
 			peersOpts := peers.NewOptions().
 				SetResultOptions(bsOpts).
 				SetAdminClient(adminClient).
-				SetFetchBlocksMetadataEndpointVersion(setupOpts[i].fetchBlocksMetadataEndpointVersion).
 				// DatabaseBlockRetrieverManager and PersistManager need to be set or we will never execute
 				// the persist bootstrapping path
 				SetDatabaseBlockRetrieverManager(setup.storageOpts.DatabaseBlockRetrieverManager()).
diff --git a/src/dbnode/integration/peers_bootstrap_high_concurrency_test.go b/src/dbnode/integration/peers_bootstrap_high_concurrency_test.go
index 0c715bde1e..fccc7c2409 100644
--- a/src/dbnode/integration/peers_bootstrap_high_concurrency_test.go
+++ b/src/dbnode/integration/peers_bootstrap_high_concurrency_test.go
@@ -27,7 +27,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/m3db/m3/src/dbnode/client"
 	"github.com/m3db/m3/src/dbnode/integration/generate"
 	"github.com/m3db/m3/src/dbnode/retention"
 	"github.com/m3db/m3/src/dbnode/storage/namespace"
@@ -36,17 +35,11 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-// TODO(rartoul): Delete this once we've tested V2 in prod
 func TestPeersBootstrapHighConcurrency(t *testing.T) {
 	if testing.Short() {
 		t.SkipNow()
 	}
 
-	testPeersBootstrapHighConcurrency(t, client.FetchBlocksMetadataEndpointV1)
-}
-
-func testPeersBootstrapHighConcurrency(
-	t *testing.T, version client.FetchBlocksMetadataEndpointVersion) {
 	// Test setups
 	log := xlog.SimpleLogger
 	retentionOpts := retention.NewOptions().
@@ -67,10 +60,9 @@ func testPeersBootstrapHighConcurrency(
 			disablePeersBootstrapper: true,
 		},
 		{
-			disablePeersBootstrapper:           false,
-			bootstrapBlocksBatchSize:           batchSize,
-			bootstrapBlocksConcurrency:         concurrency,
-			fetchBlocksMetadataEndpointVersion: version,
+			disablePeersBootstrapper:   false,
+			bootstrapBlocksBatchSize:   batchSize,
+			bootstrapBlocksConcurrency: concurrency,
 		},
 	}
 	setups, closeFn := newDefaultBootstrappableTestSetups(t, opts, setupOpts)
diff --git a/src/dbnode/integration/peers_bootstrap_index_test.go b/src/dbnode/integration/peers_bootstrap_index_test.go
index 4ecb202c2d..ae19725e65 100644
--- a/src/dbnode/integration/peers_bootstrap_index_test.go
+++ b/src/dbnode/integration/peers_bootstrap_index_test.go
@@ -26,7 +26,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/m3db/m3/src/dbnode/client"
 	"github.com/m3db/m3/src/dbnode/integration/generate"
 	"github.com/m3db/m3/src/dbnode/retention"
 	"github.com/m3db/m3/src/dbnode/storage/index"
@@ -45,8 +44,6 @@ func TestPeersBootstrapIndexWithIndexingEnabled(t *testing.T) {
 
 	log := xlog.SimpleLogger
 
-	// Index metadata exchange is only possible with version 2
-	version := client.FetchBlocksMetadataEndpointV2
 	blockSize := 2 * time.Hour
 
 	rOpts := retention.NewOptions().
@@ -68,7 +65,7 @@ func TestPeersBootstrapIndexWithIndexingEnabled(t *testing.T) {
 
 	setupOpts := []bootstrappableTestSetupOptions{
 		{disablePeersBootstrapper: true},
-		{disablePeersBootstrapper: false, fetchBlocksMetadataEndpointVersion: version},
+		{disablePeersBootstrapper: false},
 	}
 	setups, closeFn := newDefaultBootstrappableTestSetups(t, opts, setupOpts)
 	defer closeFn()
diff --git a/src/dbnode/integration/peers_bootstrap_merge_local_test.go b/src/dbnode/integration/peers_bootstrap_merge_local_test.go
index a5004f645a..fc07924de3 100644
--- a/src/dbnode/integration/peers_bootstrap_merge_local_test.go
+++ b/src/dbnode/integration/peers_bootstrap_merge_local_test.go
@@ -26,7 +26,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/m3db/m3/src/dbnode/client"
 	"github.com/m3db/m3/src/dbnode/integration/generate"
 	"github.com/m3db/m3/src/dbnode/retention"
 	"github.com/m3db/m3/src/dbnode/storage/namespace"
@@ -37,17 +36,11 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-// TODO(rartoul): Delete this once we've tested V2 in prod
 func TestPeersBootstrapMergeLocal(t *testing.T) {
 	if testing.Short() {
 		t.SkipNow()
 	}
 
-	testPeersBootstrapMergeLocal(t, client.FetchBlocksMetadataEndpointV1)
-}
-
-func testPeersBootstrapMergeLocal(
-	t *testing.T, version client.FetchBlocksMetadataEndpointVersion) {
 	// Test setups
 	log := xlog.SimpleLogger
 	retentionOpts := retention.NewOptions().
@@ -74,10 +67,9 @@ func testPeersBootstrapMergeLocal(
 				useTChannelClientForWriting: true,
 			},
 			{
-				disablePeersBootstrapper:           false,
-				useTChannelClientForWriting:        true,
-				testStatsReporter:                  reporter,
-				fetchBlocksMetadataEndpointVersion: version,
+				disablePeersBootstrapper:    false,
+				useTChannelClientForWriting: true,
+				testStatsReporter:           reporter,
 			},
 		}
 	)
diff --git a/src/dbnode/integration/peers_bootstrap_merge_peer_blocks_test.go b/src/dbnode/integration/peers_bootstrap_merge_peer_blocks_test.go
index d57ab7fcda..68f3db8200 100644
--- a/src/dbnode/integration/peers_bootstrap_merge_peer_blocks_test.go
+++ b/src/dbnode/integration/peers_bootstrap_merge_peer_blocks_test.go
@@ -26,7 +26,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/m3db/m3/src/dbnode/client"
 	"github.com/m3db/m3/src/dbnode/integration/generate"
 	"github.com/m3db/m3/src/dbnode/retention"
 	"github.com/m3db/m3/src/dbnode/storage/namespace"
@@ -37,17 +36,11 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-// TODO(rartoul): Delete this once we've tested V2 in prod
 func TestPeersBootstrapMergePeerBlocks(t *testing.T) {
 	if testing.Short() {
 		t.SkipNow()
 	}
 
-	testPeersBootstrapMergePeerBlocks(t, client.FetchBlocksMetadataEndpointV1)
-}
-
-func testPeersBootstrapMergePeerBlocks(
-	t *testing.T, version client.FetchBlocksMetadataEndpointVersion) {
 	// Test setups
 	log := xlog.SimpleLogger
 	retentionOpts := retention.NewOptions().
@@ -63,7 +56,7 @@ func testPeersBootstrapMergePeerBlocks(
 	setupOpts := []bootstrappableTestSetupOptions{
 		{disablePeersBootstrapper: true},
 		{disablePeersBootstrapper: true},
-		{disablePeersBootstrapper: false, fetchBlocksMetadataEndpointVersion: version},
+		{disablePeersBootstrapper: false},
 	}
 	setups, closeFn := newDefaultBootstrappableTestSetups(t, opts, setupOpts)
 	defer closeFn()
diff --git a/src/dbnode/integration/peers_bootstrap_node_down_test.go b/src/dbnode/integration/peers_bootstrap_node_down_test.go
index 3d5164b6a0..09be80649a 100644
--- a/src/dbnode/integration/peers_bootstrap_node_down_test.go
+++ b/src/dbnode/integration/peers_bootstrap_node_down_test.go
@@ -26,7 +26,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/m3db/m3/src/dbnode/client"
 	"github.com/m3db/m3/src/dbnode/integration/generate"
 	"github.com/m3db/m3/src/dbnode/retention"
 	"github.com/m3db/m3/src/dbnode/storage/namespace"
@@ -35,17 +34,11 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-// TODO(rartoul): Delete this once we've tested V2 in prod
 func TestPeersBootstrapNodeDown(t *testing.T) {
 	if testing.Short() {
 		t.SkipNow()
 	}
 
-	testPeersBootstrapNodeDown(t, client.FetchBlocksMetadataEndpointV1)
-}
-
-func testPeersBootstrapNodeDown(
-	t *testing.T, version client.FetchBlocksMetadataEndpointVersion) {
 	// Test setups
 	log := xlog.SimpleLogger
 	retentionOpts := retention.NewOptions().
@@ -63,7 +56,7 @@ func testPeersBootstrapNodeDown(
 	setupOpts := []bootstrappableTestSetupOptions{
 		{disablePeersBootstrapper: true},
 		{disablePeersBootstrapper: true},
-		{disablePeersBootstrapper: false, fetchBlocksMetadataEndpointVersion: version},
+		{disablePeersBootstrapper: false},
 	}
 	setups, closeFn := newDefaultBootstrappableTestSetups(t, opts, setupOpts)
 	defer closeFn()
diff --git a/src/dbnode/integration/peers_bootstrap_none_available_test.go b/src/dbnode/integration/peers_bootstrap_none_available_test.go
index 64f5a8d1a6..ec067501ad 100644
--- a/src/dbnode/integration/peers_bootstrap_none_available_test.go
+++ b/src/dbnode/integration/peers_bootstrap_none_available_test.go
@@ -29,7 +29,6 @@ import (
 
 	"github.com/m3db/m3/src/cluster/services"
 	"github.com/m3db/m3/src/cluster/shard"
-	"github.com/m3db/m3/src/dbnode/client"
 	"github.com/m3db/m3/src/dbnode/retention"
 	"github.com/m3db/m3/src/dbnode/sharding"
 	"github.com/m3db/m3/src/dbnode/storage/namespace"
@@ -88,14 +87,12 @@ func TestPeersBootstrapNoneAvailable(t *testing.T) {
 
 	setupOpts := []bootstrappableTestSetupOptions{
 		{
-			disablePeersBootstrapper:           false,
-			fetchBlocksMetadataEndpointVersion: client.FetchBlocksMetadataEndpointV2,
-			topologyInitializer:                topoInit,
+			disablePeersBootstrapper: false,
+			topologyInitializer:      topoInit,
 		},
 		{
-			disablePeersBootstrapper:           false,
-			fetchBlocksMetadataEndpointVersion: client.FetchBlocksMetadataEndpointV2,
-			topologyInitializer:                topoInit,
+			disablePeersBootstrapper: false,
+			topologyInitializer:      topoInit,
 		},
 	}
 	setups, closeFn := newDefaultBootstrappableTestSetups(t, opts, setupOpts)
diff --git a/src/dbnode/integration/peers_bootstrap_select_best_test.go b/src/dbnode/integration/peers_bootstrap_select_best_test.go
index 7adb054d9c..ca2cc70656 100644
--- a/src/dbnode/integration/peers_bootstrap_select_best_test.go
+++ b/src/dbnode/integration/peers_bootstrap_select_best_test.go
@@ -26,7 +26,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/m3db/m3/src/dbnode/client"
 	"github.com/m3db/m3/src/dbnode/integration/generate"
 	"github.com/m3db/m3/src/dbnode/retention"
 	"github.com/m3db/m3/src/dbnode/storage/namespace"
@@ -37,17 +36,11 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-// TODO(rartoul): Delete this once we've tested V2 in prod
 func TestPeersBootstrapSelectBest(t *testing.T) {
 	if testing.Short() {
 		t.SkipNow()
 	}
 
-	testPeerBootstrapSelectBest(t, client.FetchBlocksMetadataEndpointV1)
-}
-
-func testPeerBootstrapSelectBest(
-	t *testing.T, version client.FetchBlocksMetadataEndpointVersion) {
 	// Test setups
 	log := xlog.SimpleLogger
 	retentionOpts := retention.NewOptions().
@@ -63,7 +56,7 @@ func testPeerBootstrapSelectBest(
 	setupOpts := []bootstrappableTestSetupOptions{
 		{disablePeersBootstrapper: true},
 		{disablePeersBootstrapper: true},
-		{disablePeersBootstrapper: false, fetchBlocksMetadataEndpointVersion: version},
+		{disablePeersBootstrapper: false},
 	}
 	setups, closeFn := newDefaultBootstrappableTestSetups(t, opts, setupOpts)
 	defer closeFn()
diff --git a/src/dbnode/integration/peers_bootstrap_simple_test.go b/src/dbnode/integration/peers_bootstrap_simple_test.go
index 3184d9d245..2615b3d0b5 100644
--- a/src/dbnode/integration/peers_bootstrap_simple_test.go
+++ b/src/dbnode/integration/peers_bootstrap_simple_test.go
@@ -26,7 +26,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/m3db/m3/src/dbnode/client"
 	"github.com/m3db/m3/src/dbnode/integration/generate"
 	"github.com/m3db/m3/src/dbnode/retention"
 	"github.com/m3db/m3/src/dbnode/storage/namespace"
@@ -35,17 +34,11 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-// TODO(rartoul): Delete this once we've tested V2 in prod
 func TestPeersBootstrapSimple(t *testing.T) {
 	if testing.Short() {
 		t.SkipNow()
 	}
 
-	testPeerBootstrapSimple(t, client.FetchBlocksMetadataEndpointV1)
-}
-
-func testPeerBootstrapSimple(
-	t *testing.T, version client.FetchBlocksMetadataEndpointVersion) {
 	// Test setups
 	log := xlog.SimpleLogger
 	retentionOpts := retention.NewOptions().
@@ -60,7 +53,7 @@ func testPeerBootstrapSimple(
 
 	setupOpts := []bootstrappableTestSetupOptions{
 		{disablePeersBootstrapper: true},
-		{disablePeersBootstrapper: false, fetchBlocksMetadataEndpointVersion: version},
+		{disablePeersBootstrapper: false},
 	}
 	setups, closeFn := newDefaultBootstrappableTestSetups(t, opts, setupOpts)
 	defer closeFn()
diff --git a/src/dbnode/integration/peers_bootstrap_single_node_test.go b/src/dbnode/integration/peers_bootstrap_single_node_test.go
index b71d1b9c9d..482eda78d9 100644
--- a/src/dbnode/integration/peers_bootstrap_single_node_test.go
+++ b/src/dbnode/integration/peers_bootstrap_single_node_test.go
@@ -26,7 +26,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/m3db/m3/src/dbnode/client"
 	"github.com/m3db/m3/src/dbnode/integration/generate"
 	"github.com/m3db/m3/src/dbnode/retention"
 	"github.com/m3db/m3/src/dbnode/storage/namespace"
@@ -55,7 +54,7 @@ func TestPeersBootstrapSingleNode(t *testing.T) {
 		SetNamespaces([]namespace.Metadata{namesp})
 
 	setupOpts := []bootstrappableTestSetupOptions{
-		{disablePeersBootstrapper: false, fetchBlocksMetadataEndpointVersion: client.FetchBlocksMetadataEndpointV1},
+		{disablePeersBootstrapper: false},
 	}
 	setups, closeFn := newDefaultBootstrappableTestSetups(t, opts, setupOpts)
 	defer closeFn()
diff --git a/src/dbnode/integration/peers_bootstrap_v2_high_concurrency_test.go b/src/dbnode/integration/peers_bootstrap_v2_high_concurrency_test.go
deleted file mode 100644
index f2ae6a2849..0000000000
--- a/src/dbnode/integration/peers_bootstrap_v2_high_concurrency_test.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// +build integration
-
-// Copyright (c) 2017 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package integration
-
-import (
-	"testing"
-
-	"github.com/m3db/m3/src/dbnode/client"
-)
-
-func TestPeersBootstrapHighConcurrencyV2(t *testing.T) {
-	if testing.Short() {
-		t.SkipNow()
-	}
-
-	testPeersBootstrapHighConcurrency(t, client.FetchBlocksMetadataEndpointV2)
-}
diff --git a/src/dbnode/integration/peers_bootstrap_v2_merge_local_test.go b/src/dbnode/integration/peers_bootstrap_v2_merge_local_test.go
deleted file mode 100644
index 821ac8f207..0000000000
--- a/src/dbnode/integration/peers_bootstrap_v2_merge_local_test.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// +build integration
-
-// Copyright (c) 2017 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package integration
-
-import (
-	"testing"
-
-	"github.com/m3db/m3/src/dbnode/client"
-)
-
-func TestPeersBootstrapMergeLocalV2(t *testing.T) {
-	if testing.Short() {
-		t.SkipNow()
-	}
-
-	testPeersBootstrapMergeLocal(t, client.FetchBlocksMetadataEndpointV2)
-}
diff --git a/src/dbnode/integration/peers_bootstrap_v2_merge_peer_blocks_test.go b/src/dbnode/integration/peers_bootstrap_v2_merge_peer_blocks_test.go
deleted file mode 100644
index 057fdfb34c..0000000000
--- a/src/dbnode/integration/peers_bootstrap_v2_merge_peer_blocks_test.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// +build integration
-
-// Copyright (c) 2017 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package integration
-
-import (
-	"testing"
-
-	"github.com/m3db/m3/src/dbnode/client"
-)
-
-func TestPeersBootstrapMergePeerBlocksV2(t *testing.T) {
-	if testing.Short() {
-		t.SkipNow()
-	}
-
-	testPeersBootstrapMergePeerBlocks(t, client.FetchBlocksMetadataEndpointV2)
-}
diff --git a/src/dbnode/integration/peers_bootstrap_v2_node_down_test.go b/src/dbnode/integration/peers_bootstrap_v2_node_down_test.go
deleted file mode 100644
index 76844bfbe5..0000000000
--- a/src/dbnode/integration/peers_bootstrap_v2_node_down_test.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// +build integration
-
-// Copyright (c) 2017 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package integration
-
-import (
-	"testing"
-
-	"github.com/m3db/m3/src/dbnode/client"
-)
-
-func TestPeersBootstrapNodeDownV2(t *testing.T) {
-	if testing.Short() {
-		t.SkipNow()
-	}
-
-	testPeersBootstrapNodeDown(t, client.FetchBlocksMetadataEndpointV2)
-}
diff --git a/src/dbnode/integration/peers_bootstrap_v2_select_best_test.go b/src/dbnode/integration/peers_bootstrap_v2_select_best_test.go
deleted file mode 100644
index 27731375e7..0000000000
--- a/src/dbnode/integration/peers_bootstrap_v2_select_best_test.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// +build integration
-
-// Copyright (c) 2017 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package integration
-
-import (
-	"testing"
-
-	"github.com/m3db/m3/src/dbnode/client"
-)
-
-func TestPeersBootstrapSelectBestV2(t *testing.T) {
-	if testing.Short() {
-		t.SkipNow()
-	}
-
-	testPeerBootstrapSelectBest(t, client.FetchBlocksMetadataEndpointV2)
-}
diff --git a/src/dbnode/integration/peers_bootstrap_v2_simple_test.go b/src/dbnode/integration/peers_bootstrap_v2_simple_test.go
deleted file mode 100644
index 8b2e9317dc..0000000000
--- a/src/dbnode/integration/peers_bootstrap_v2_simple_test.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// +build integration
-
-// Copyright (c) 2017 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package integration
-
-import (
-	"testing"
-
-	"github.com/m3db/m3/src/dbnode/client"
-)
-
-func TestPeersBootstrapSimpleV2(t *testing.T) {
-	if testing.Short() {
-		t.SkipNow()
-	}
-
-	testPeerBootstrapSimple(t, client.FetchBlocksMetadataEndpointV2)
-}
diff --git a/src/dbnode/storage/bootstrap/bootstrapper/peers/options.go b/src/dbnode/storage/bootstrap/bootstrapper/peers/options.go
index aa3935f6d4..ffa08d6422 100644
--- a/src/dbnode/storage/bootstrap/bootstrapper/peers/options.go
+++ b/src/dbnode/storage/bootstrap/bootstrapper/peers/options.go
@@ -33,39 +33,35 @@ import (
 )
 
 var (
-	defaultDefaultShardConcurrency            = runtime.NumCPU()
-	defaultShardPersistenceConcurrency        = int(math.Max(1, float64(runtime.NumCPU())/2))
-	defaultPersistenceMaxQueueSize            = 0
-	defaultFetchBlocksMetadataEndpointVersion = client.FetchBlocksMetadataEndpointV1
+	defaultDefaultShardConcurrency     = runtime.NumCPU()
+	defaultShardPersistenceConcurrency = int(math.Max(1, float64(runtime.NumCPU())/2))
+	defaultPersistenceMaxQueueSize     = 0
 )
 
 var (
-	errAdminClientNotSet                 = errors.New("admin client not set")
-	errInvalidFetchBlocksMetadataVersion = errors.New("invalid fetch blocks metadata endpoint version")
-	errPersistManagerNotSet              = errors.New("persist manager not set")
-	errRuntimeOptionsManagerNotSet       = errors.New("runtime options manager not set")
+	errAdminClientNotSet           = errors.New("admin client not set")
+	errPersistManagerNotSet        = errors.New("persist manager not set")
+	errRuntimeOptionsManagerNotSet = errors.New("runtime options manager not set")
 )
 
 type options struct {
-	resultOpts                         result.Options
-	client                             client.AdminClient
-	defaultShardConcurrency            int
-	shardPersistenceConcurrency        int
-	persistenceMaxQueueSize            int
-	persistManager                     persist.Manager
-	blockRetrieverManager              block.DatabaseBlockRetrieverManager
-	fetchBlocksMetadataEndpointVersion client.FetchBlocksMetadataEndpointVersion
-	runtimeOptionsManager              m3dbruntime.OptionsManager
+	resultOpts                  result.Options
+	client                      client.AdminClient
+	defaultShardConcurrency     int
+	shardPersistenceConcurrency int
+	persistenceMaxQueueSize     int
+	persistManager              persist.Manager
+	blockRetrieverManager       block.DatabaseBlockRetrieverManager
+	runtimeOptionsManager       m3dbruntime.OptionsManager
 }
 
 // NewOptions creates new bootstrap options
 func NewOptions() Options {
 	return &options{
-		resultOpts:                         result.NewOptions(),
-		defaultShardConcurrency:            defaultDefaultShardConcurrency,
-		shardPersistenceConcurrency:        defaultShardPersistenceConcurrency,
-		persistenceMaxQueueSize:            defaultPersistenceMaxQueueSize,
-		fetchBlocksMetadataEndpointVersion: defaultFetchBlocksMetadataEndpointVersion,
+		resultOpts:                  result.NewOptions(),
+		defaultShardConcurrency:     defaultDefaultShardConcurrency,
+		shardPersistenceConcurrency: defaultShardPersistenceConcurrency,
+		persistenceMaxQueueSize:     defaultPersistenceMaxQueueSize,
 	}
 }
 
@@ -73,9 +69,6 @@ func (o *options) Validate() error {
 	if client := o.client; client == nil {
 		return errAdminClientNotSet
 	}
-	if !client.IsValidFetchBlocksMetadataEndpoint(o.fetchBlocksMetadataEndpointVersion) {
-		return errInvalidFetchBlocksMetadataVersion
-	}
 	if o.persistManager == nil {
 		return errPersistManagerNotSet
 	}
@@ -157,16 +150,6 @@ func (o *options) DatabaseBlockRetrieverManager() block.DatabaseBlockRetrieverMa
 	return o.blockRetrieverManager
 }
 
-func (o *options) SetFetchBlocksMetadataEndpointVersion(value client.FetchBlocksMetadataEndpointVersion) Options {
-	opts := *o
-	opts.fetchBlocksMetadataEndpointVersion = value
-	return &opts
-}
-
-func (o *options) FetchBlocksMetadataEndpointVersion() client.FetchBlocksMetadataEndpointVersion {
-	return o.fetchBlocksMetadataEndpointVersion
-}
-
 func (o *options) SetRuntimeOptionsManager(value m3dbruntime.OptionsManager) Options {
 	opts := *o
 	opts.runtimeOptionsManager = value
diff --git a/src/dbnode/storage/bootstrap/bootstrapper/peers/source.go b/src/dbnode/storage/bootstrap/bootstrapper/peers/source.go
index 6f8389bf47..70c00df384 100644
--- a/src/dbnode/storage/bootstrap/bootstrapper/peers/source.go
+++ b/src/dbnode/storage/bootstrap/bootstrapper/peers/source.go
@@ -272,10 +272,9 @@ func (s *peersSource) fetchBootstrapBlocksFromPeers(
 		currRange := it.Value()
 
 		for blockStart := currRange.Start; blockStart.Before(currRange.End); blockStart = blockStart.Add(blockSize) {
-			version := s.opts.FetchBlocksMetadataEndpointVersion()
 			blockEnd := blockStart.Add(blockSize)
 			shardResult, err := session.FetchBootstrapBlocksFromPeers(
-				nsMetadata, shard, blockStart, blockEnd, bopts, version)
+				nsMetadata, shard, blockStart, blockEnd, bopts)
 
 			s.logFetchBootstrapBlocksFromPeersOutcome(shard, shardResult, err)
 
@@ -564,7 +563,6 @@ func (s *peersSource) ReadIndex(
 		dataBlockSize = ns.Options().RetentionOptions().BlockSize()
 		resultOpts    = s.opts.ResultOptions()
 		idxOpts       = ns.Options().IndexOptions()
-		version       = s.opts.FetchBlocksMetadataEndpointVersion()
 		resultLock    = &sync.Mutex{}
 		wg            sync.WaitGroup
 	)
@@ -600,7 +598,7 @@ func (s *peersSource) ReadIndex(
 					}
 
 					metadata, err := session.FetchBootstrapBlocksMetadataFromPeers(ns.ID(),
-						shard, currRange.Start, currRange.End, resultOpts, version)
+						shard, currRange.Start, currRange.End, resultOpts)
 					if err != nil {
 						// Make this period unfulfilled
 						markUnfulfilled(err)
diff --git a/src/dbnode/storage/bootstrap/bootstrapper/peers/source_data_test.go b/src/dbnode/storage/bootstrap/bootstrapper/peers/source_data_test.go
index c97b46ff0c..1b6af55379 100644
--- a/src/dbnode/storage/bootstrap/bootstrapper/peers/source_data_test.go
+++ b/src/dbnode/storage/bootstrap/bootstrapper/peers/source_data_test.go
@@ -189,11 +189,11 @@ func TestPeersSourceReturnsFulfilledAndUnfulfilled(t *testing.T) {
 	mockAdminSession := client.NewMockAdminSession(ctrl)
 	mockAdminSession.EXPECT().
 		FetchBootstrapBlocksFromPeers(namespace.NewMetadataMatcher(nsMetadata),
-			uint32(0), start, end, gomock.Any(), client.FetchBlocksMetadataEndpointV1).
+			uint32(0), start, end, gomock.Any()).
 		Return(goodResult, nil)
 	mockAdminSession.EXPECT().
 		FetchBootstrapBlocksFromPeers(namespace.NewMetadataMatcher(nsMetadata),
-			uint32(1), start, end, gomock.Any(), client.FetchBlocksMetadataEndpointV1).
+			uint32(1), start, end, gomock.Any()).
 		Return(nil, badErr)
 
 	mockAdminClient := client.NewMockAdminClient(ctrl)
@@ -267,19 +267,19 @@ func TestPeersSourceRunWithPersist(t *testing.T) {
 		mockAdminSession := client.NewMockAdminSession(ctrl)
 		mockAdminSession.EXPECT().
 			FetchBootstrapBlocksFromPeers(namespace.NewMetadataMatcher(testNsMd),
-				uint32(0), start, start.Add(blockSize), gomock.Any(), client.FetchBlocksMetadataEndpointV1).
+				uint32(0), start, start.Add(blockSize), gomock.Any()).
 			Return(shard0ResultBlock1, nil)
 		mockAdminSession.EXPECT().
 			FetchBootstrapBlocksFromPeers(namespace.NewMetadataMatcher(testNsMd),
-				uint32(0), start.Add(blockSize), start.Add(blockSize*2), gomock.Any(), client.FetchBlocksMetadataEndpointV1).
+				uint32(0), start.Add(blockSize), start.Add(blockSize*2), gomock.Any()).
 			Return(shard0ResultBlock2, nil)
 		mockAdminSession.EXPECT().
 			FetchBootstrapBlocksFromPeers(namespace.NewMetadataMatcher(testNsMd),
-				uint32(1), start, start.Add(blockSize), gomock.Any(), client.FetchBlocksMetadataEndpointV1).
+				uint32(1), start, start.Add(blockSize), gomock.Any()).
 			Return(shard1ResultBlock1, nil)
 		mockAdminSession.EXPECT().
 			FetchBootstrapBlocksFromPeers(namespace.NewMetadataMatcher(testNsMd),
-				uint32(1), start.Add(blockSize), start.Add(blockSize*2), gomock.Any(), client.FetchBlocksMetadataEndpointV1).
+				uint32(1), start.Add(blockSize), start.Add(blockSize*2), gomock.Any()).
 			Return(shard1ResultBlock2, nil)
 
 		mockAdminClient := client.NewMockAdminClient(ctrl)
@@ -511,7 +511,7 @@ func TestPeersSourceMarksUnfulfilledOnPersistenceErrors(t *testing.T) {
 		mockAdminSession.EXPECT().
 			FetchBootstrapBlocksFromPeers(namespace.NewMetadataMatcher(testNsMd),
 				key.shard, time.Unix(0, key.start), time.Unix(0, key.end),
-				gomock.Any(), client.FetchBlocksMetadataEndpointV1).
+				gomock.Any()).
 			Return(result, nil)
 	}
 
diff --git a/src/dbnode/storage/bootstrap/bootstrapper/peers/source_index_test.go b/src/dbnode/storage/bootstrap/bootstrapper/peers/source_index_test.go
index e59750c158..6e77770a37 100644
--- a/src/dbnode/storage/bootstrap/bootstrapper/peers/source_index_test.go
+++ b/src/dbnode/storage/bootstrap/bootstrapper/peers/source_index_test.go
@@ -71,8 +71,7 @@ func TestBootstrapIndex(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
-	opts := testDefaultOpts.
-		SetFetchBlocksMetadataEndpointVersion(client.FetchBlocksMetadataEndpointV2)
+	opts := testDefaultOpts
 
 	blockSize := 2 * time.Hour
 	indexBlockSize := 2 * blockSize
@@ -180,11 +179,10 @@ func TestBootstrapIndex(t *testing.T) {
 
 			rangeStart := blockStart
 			rangeEnd := rangeStart.Add(blockSize)
-			version := opts.FetchBlocksMetadataEndpointVersion()
 
 			call := mockAdminSession.EXPECT().
 				FetchBootstrapBlocksMetadataFromPeers(ident.NewIDMatcher(nsID),
-					uint32(0), rangeStart, rangeEnd, gomock.Any(), version).
+					uint32(0), rangeStart, rangeEnd, gomock.Any()).
 				Return(mockIter, nil)
 			mockAdminSessionCalls = append(mockAdminSessionCalls, call)
 			break
@@ -199,11 +197,10 @@ func TestBootstrapIndex(t *testing.T) {
 
 			rangeStart := blockStart
 			rangeEnd := rangeStart.Add(blockSize)
-			version := opts.FetchBlocksMetadataEndpointVersion()
 
 			call := mockAdminSession.EXPECT().
 				FetchBootstrapBlocksMetadataFromPeers(ident.NewIDMatcher(nsID),
-					uint32(0), rangeStart, rangeEnd, gomock.Any(), version).
+					uint32(0), rangeStart, rangeEnd, gomock.Any()).
 				Return(mockIter, nil)
 			mockAdminSessionCalls = append(mockAdminSessionCalls, call)
 		}
@@ -324,8 +321,7 @@ func TestBootstrapIndexErr(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
-	opts := testDefaultOpts.
-		SetFetchBlocksMetadataEndpointVersion(client.FetchBlocksMetadataEndpointV2)
+	opts := testDefaultOpts
 
 	blockSize := 2 * time.Hour
 	indexBlockSize := 2 * blockSize
@@ -420,11 +416,10 @@ func TestBootstrapIndexErr(t *testing.T) {
 
 			rangeStart := blockStart
 			rangeEnd := rangeStart.Add(blockSize)
-			version := opts.FetchBlocksMetadataEndpointVersion()
 
 			call := mockAdminSession.EXPECT().
 				FetchBootstrapBlocksMetadataFromPeers(ident.NewIDMatcher(nsID),
-					uint32(0), rangeStart, rangeEnd, gomock.Any(), version).
+					uint32(0), rangeStart, rangeEnd, gomock.Any()).
 				Return(mockIter, nil)
 			mockAdminSessionCalls = append(mockAdminSessionCalls, call)
 			break
@@ -439,11 +434,10 @@ func TestBootstrapIndexErr(t *testing.T) {
 
 			rangeStart := blockStart
 			rangeEnd := rangeStart.Add(blockSize)
-			version := opts.FetchBlocksMetadataEndpointVersion()
 
 			call := mockAdminSession.EXPECT().
 				FetchBootstrapBlocksMetadataFromPeers(ident.NewIDMatcher(nsID),
-					uint32(0), rangeStart, rangeEnd, gomock.Any(), version).
+					uint32(0), rangeStart, rangeEnd, gomock.Any()).
 				Return(mockIter, nil)
 			mockAdminSessionCalls = append(mockAdminSessionCalls, call)
 		}
diff --git a/src/dbnode/storage/bootstrap/bootstrapper/peers/types.go b/src/dbnode/storage/bootstrap/bootstrapper/peers/types.go
index a01b4453ec..06d6b5a8ee 100644
--- a/src/dbnode/storage/bootstrap/bootstrapper/peers/types.go
+++ b/src/dbnode/storage/bootstrap/bootstrapper/peers/types.go
@@ -95,14 +95,6 @@ type Options interface {
 	// persistence enabled.
 	DatabaseBlockRetrieverManager() block.DatabaseBlockRetrieverManager
 
-	// SetFetchBlocksMetadataEndpointVersion sets the version of the fetch blocks
-	// metadata endpoint that the peer bootstrapper will use
-	SetFetchBlocksMetadataEndpointVersion(value client.FetchBlocksMetadataEndpointVersion) Options
-
-	// SetFetchBlocksMetadataEndpointVersion returns the version of the fetch blocks
-	// metadata endpoint that the peer bootstrapper will use
-	FetchBlocksMetadataEndpointVersion() client.FetchBlocksMetadataEndpointVersion
-
 	// SetRuntimeOptionsManagers sets the RuntimeOptionsManager.
 	SetRuntimeOptionsManager(value m3dbruntime.OptionsManager) Options
 
diff --git a/src/dbnode/storage/repair.go b/src/dbnode/storage/repair.go
index 26d0517ee9..3208b934bd 100644
--- a/src/dbnode/storage/repair.go
+++ b/src/dbnode/storage/repair.go
@@ -123,7 +123,7 @@ func (r shardRepairer) Repair(
 	// Add peer metadata
 	level := r.rpopts.RepairConsistencyLevel()
 	peerIter, err := session.FetchBlocksMetadataFromPeers(namespace, shard.ID(), start, end,
-		level, result.NewOptions(), client.FetchBlocksMetadataEndpointV2)
+		level, result.NewOptions())
 	if err != nil {
 		return repair.MetadataComparisonResult{}, err
 	}
diff --git a/src/dbnode/storage/repair_test.go b/src/dbnode/storage/repair_test.go
index ebb48cf9fe..86e24d0c66 100644
--- a/src/dbnode/storage/repair_test.go
+++ b/src/dbnode/storage/repair_test.go
@@ -292,7 +292,7 @@ func TestDatabaseShardRepairerRepair(t *testing.T) {
 	)
 	session.EXPECT().
 		FetchBlocksMetadataFromPeers(namespace, shardID, start, end,
-			rpOpts.RepairConsistencyLevel(), gomock.Any(), client.FetchBlocksMetadataEndpointV2).
+			rpOpts.RepairConsistencyLevel(), gomock.Any()).
 		Return(peerIter, nil)
 
 	var (