diff --git a/metrics/metrics.go b/metrics/metrics.go
index 85b9d82ec..c47642dc4 100644
--- a/metrics/metrics.go
+++ b/metrics/metrics.go
@@ -74,22 +74,6 @@ var (
 	PeerCount          = stats.Int64("peer/count", "Current number of FIL peers", stats.UnitDimensionless)
 	APIRequestDuration = stats.Float64("api/request_duration_ms", "Duration of API requests", stats.UnitMilliseconds)
 
-	// graphsync
-
-	GraphsyncReceivingPeersCount              = stats.Int64("graphsync/receiving_peers", "number of peers we are receiving graphsync data from", stats.UnitDimensionless)
-	GraphsyncReceivingActiveCount             = stats.Int64("graphsync/receiving_active", "number of active receiving graphsync transfers", stats.UnitDimensionless)
-	GraphsyncReceivingCountCount              = stats.Int64("graphsync/receiving_pending", "number of pending receiving graphsync transfers", stats.UnitDimensionless)
-	GraphsyncReceivingTotalMemoryAllocated    = stats.Int64("graphsync/receiving_total_allocated", "amount of block memory allocated for receiving graphsync data", stats.UnitBytes)
-	GraphsyncReceivingTotalPendingAllocations = stats.Int64("graphsync/receiving_pending_allocations", "amount of block memory on hold being received pending allocation", stats.UnitBytes)
-	GraphsyncReceivingPeersPending            = stats.Int64("graphsync/receiving_peers_pending", "number of peers we can't receive more data from cause of pending allocations", stats.UnitDimensionless)
-
-	GraphsyncSendingPeersCount              = stats.Int64("graphsync/sending_peers", "number of peers we are sending graphsync data to", stats.UnitDimensionless)
-	GraphsyncSendingActiveCount             = stats.Int64("graphsync/sending_active", "number of active sending graphsync transfers", stats.UnitDimensionless)
-	GraphsyncSendingCountCount              = stats.Int64("graphsync/sending_pending", "number of pending sending graphsync transfers", stats.UnitDimensionless)
-	GraphsyncSendingTotalMemoryAllocated    = stats.Int64("graphsync/sending_total_allocated", "amount of block memory allocated for sending graphsync data", stats.UnitBytes)
-	GraphsyncSendingTotalPendingAllocations = stats.Int64("graphsync/sending_pending_allocations", "amount of block memory on hold from sending pending allocation", stats.UnitBytes)
-	GraphsyncSendingPeersPending            = stats.Int64("graphsync/sending_peers_pending", "number of peers we can't send more data to cause of pending allocations", stats.UnitDimensionless)
-
 	// chain
 	ChainNodeHeight                     = stats.Int64("chain/node_height", "Current Height of the node", stats.UnitDimensionless)
 	ChainNodeHeightExpected             = stats.Int64("chain/node_height_expected", "Expected Height of the node", stats.UnitDimensionless)
@@ -580,56 +564,6 @@ var (
 		Aggregation: view.Sum(),
 	}
 
-	// graphsync
-	GraphsyncReceivingPeersCountView = &view.View{
-		Measure:     GraphsyncReceivingPeersCount,
-		Aggregation: view.LastValue(),
-	}
-	GraphsyncReceivingActiveCountView = &view.View{
-		Measure:     GraphsyncReceivingActiveCount,
-		Aggregation: view.LastValue(),
-	}
-	GraphsyncReceivingCountCountView = &view.View{
-		Measure:     GraphsyncReceivingCountCount,
-		Aggregation: view.LastValue(),
-	}
-	GraphsyncReceivingTotalMemoryAllocatedView = &view.View{
-		Measure:     GraphsyncReceivingTotalMemoryAllocated,
-		Aggregation: view.LastValue(),
-	}
-	GraphsyncReceivingTotalPendingAllocationsView = &view.View{
-		Measure:     GraphsyncReceivingTotalPendingAllocations,
-		Aggregation: view.LastValue(),
-	}
-	GraphsyncReceivingPeersPendingView = &view.View{
-		Measure:     GraphsyncReceivingPeersPending,
-		Aggregation: view.LastValue(),
-	}
-	GraphsyncSendingPeersCountView = &view.View{
-		Measure:     GraphsyncSendingPeersCount,
-		Aggregation: view.LastValue(),
-	}
-	GraphsyncSendingActiveCountView = &view.View{
-		Measure:     GraphsyncSendingActiveCount,
-		Aggregation: view.LastValue(),
-	}
-	GraphsyncSendingCountCountView = &view.View{
-		Measure:     GraphsyncSendingCountCount,
-		Aggregation: view.LastValue(),
-	}
-	GraphsyncSendingTotalMemoryAllocatedView = &view.View{
-		Measure:     GraphsyncSendingTotalMemoryAllocated,
-		Aggregation: view.LastValue(),
-	}
-	GraphsyncSendingTotalPendingAllocationsView = &view.View{
-		Measure:     GraphsyncSendingTotalPendingAllocations,
-		Aggregation: view.LastValue(),
-	}
-	GraphsyncSendingPeersPendingView = &view.View{
-		Measure:     GraphsyncSendingPeersPending,
-		Aggregation: view.LastValue(),
-	}
-
 	// rcmgr
 	RcmgrAllowConnView = &view.View{
 		Measure:     RcmgrAllowConn,
@@ -710,19 +644,6 @@ var views = []*view.View{
 	PeerCountView,
 	APIRequestDurationView,
 
-	GraphsyncReceivingPeersCountView,
-	GraphsyncReceivingActiveCountView,
-	GraphsyncReceivingCountCountView,
-	GraphsyncReceivingTotalMemoryAllocatedView,
-	GraphsyncReceivingTotalPendingAllocationsView,
-	GraphsyncReceivingPeersPendingView,
-	GraphsyncSendingPeersCountView,
-	GraphsyncSendingActiveCountView,
-	GraphsyncSendingCountCountView,
-	GraphsyncSendingTotalMemoryAllocatedView,
-	GraphsyncSendingTotalPendingAllocationsView,
-	GraphsyncSendingPeersPendingView,
-
 	RcmgrAllowConnView,
 	RcmgrBlockConnView,
 	RcmgrAllowStreamView,
diff --git a/node/builder.go b/node/builder.go
index cadd5c64c..2ea9dcac5 100644
--- a/node/builder.go
+++ b/node/builder.go
@@ -99,7 +99,6 @@ const (
 
 	RunHelloKey
 	RunChainExchangeKey
-	RunChainGraphsync
 	RunPeerMgrKey
 
 	HandleIncomingBlocksKey