diff --git a/internal/scheduler/nodedb/nodedb.go b/internal/scheduler/nodedb/nodedb.go
index e3c0c135ddf..efe0ae3d394 100644
--- a/internal/scheduler/nodedb/nodedb.go
+++ b/internal/scheduler/nodedb/nodedb.go
@@ -67,11 +67,6 @@ func (nodeDb *NodeDb) create(node *schedulerobjects.Node) (*internaltypes.Node,
 	}
 	allocatableByPriority[evictedPriority] = allocatableByPriority[minimumPriority]
 
-	evictedJobRunIds := node.EvictedJobRunIds
-	if evictedJobRunIds == nil {
-		evictedJobRunIds = make(map[string]bool)
-	}
-
 	nodeDb.mu.Lock()
 	for key := range nodeDb.indexedNodeLabels {
 		if value, ok := labels[key]; ok {
@@ -96,9 +91,9 @@ func (nodeDb *NodeDb) create(node *schedulerobjects.Node) (*internaltypes.Node,
 		labels,
 		nodeDb.resourceListFactory.FromNodeProto(totalResources.Resources),
 		allocatableByPriority,
-		fromMapKToJobResourcesIgnoreUnknown(nodeDb.resourceListFactory, node.AllocatedByQueue),
-		fromMapKToJobResourcesIgnoreUnknown(nodeDb.resourceListFactory, node.AllocatedByJobId),
-		evictedJobRunIds,
+		map[string]internaltypes.ResourceList{},
+		map[string]internaltypes.ResourceList{},
+		map[string]bool{},
 		nil), nil
 }
 
@@ -110,15 +105,6 @@ func (nodeDb *NodeDb) copyMapWithIntern(labels map[string]string) map[string]str
 	return result
 }
 
-// Ignore unknown resources, round up.
-func fromMapKToJobResourcesIgnoreUnknown[K comparable](factory *internaltypes.ResourceListFactory, m map[K]schedulerobjects.ResourceList) map[K]internaltypes.ResourceList {
-	result := make(map[K]internaltypes.ResourceList, len(m))
-	for k, v := range m {
-		result[k] = factory.FromJobResourceListIgnoreUnknown(v.Resources)
-	}
-	return result
-}
-
 func (nodeDb *NodeDb) CreateAndInsertWithJobDbJobsWithTxn(txn *memdb.Txn, jobs []*jobdb.Job, node *schedulerobjects.Node) error {
 	entry, err := nodeDb.create(node)
 	if err != nil {
diff --git a/internal/scheduler/schedulerobjects/node.go b/internal/scheduler/schedulerobjects/node.go
index 3f47d055020..6a721bf1a5e 100644
--- a/internal/scheduler/schedulerobjects/node.go
+++ b/internal/scheduler/schedulerobjects/node.go
@@ -26,9 +26,6 @@ func (node *Node) DeepCopy() *Node {
 			node.AllocatableByPriorityAndResource,
 		).DeepCopy(),
 		StateByJobRunId:             maps.Clone(node.StateByJobRunId),
-		AllocatedByJobId:            armadamaps.DeepCopy(node.AllocatedByJobId),
-		AllocatedByQueue:            armadamaps.DeepCopy(node.AllocatedByQueue),
-		EvictedJobRunIds:            maps.Clone(node.EvictedJobRunIds),
 		NonArmadaAllocatedResources: armadamaps.DeepCopy(node.NonArmadaAllocatedResources),
 		Unschedulable:               node.Unschedulable,
 	}
diff --git a/internal/scheduler/schedulerobjects/schedulerobjects.pb.go b/internal/scheduler/schedulerobjects/schedulerobjects.pb.go
index abc8f58eb2e..d4292f51611 100644
--- a/internal/scheduler/schedulerobjects/schedulerobjects.pb.go
+++ b/internal/scheduler/schedulerobjects/schedulerobjects.pb.go
@@ -173,12 +173,6 @@ type Node struct {
 	AllocatableByPriorityAndResource map[int32]ResourceList `protobuf:"bytes,8,rep,name=allocatable_by_priority_and_resource,json=allocatableByPriorityAndResource,proto3" json:"allocatableByPriorityAndResource" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Ids of the job runs currently assigned to this node and their current state.
 	StateByJobRunId map[string]JobRunState `protobuf:"bytes,9,rep,name=state_by_job_run_id,json=stateByJobRunId,proto3" json:"stateByJobRunId" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3,enum=schedulerobjects.JobRunState"`
-	// Resource allocated to jobs on this node.
-	AllocatedByJobId map[string]ResourceList `protobuf:"bytes,10,rep,name=allocated_by_job_id,json=allocatedByJobId,proto3" json:"allocatedByJobId" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	// Resource allocated to queues on this node.
-	AllocatedByQueue map[string]ResourceList `protobuf:"bytes,11,rep,name=allocated_by_queue,json=allocatedByQueue,proto3" json:"allocatedByQueue" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	// Ids of all runs evicted on this node.
-	EvictedJobRunIds map[string]bool `protobuf:"bytes,14,rep,name=evicted_job_run_ids,json=evictedJobRunIds,proto3" json:"evictedJobRunIds" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
 	// Resource allocated to non-Armada pods on this node.
 	NonArmadaAllocatedResources map[int32]ResourceList `protobuf:"bytes,13,rep,name=non_armada_allocated_resources,json=nonArmadaAllocatedResources,proto3" json:"nonArmadaAllocatedResources" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// If true, no new jobs should be scheduled onto this node, e.g., because the node has been cordoned.
@@ -296,27 +290,6 @@ func (m *Node) GetStateByJobRunId() map[string]JobRunState {
 	return nil
 }
 
-func (m *Node) GetAllocatedByJobId() map[string]ResourceList {
-	if m != nil {
-		return m.AllocatedByJobId
-	}
-	return nil
-}
-
-func (m *Node) GetAllocatedByQueue() map[string]ResourceList {
-	if m != nil {
-		return m.AllocatedByQueue
-	}
-	return nil
-}
-
-func (m *Node) GetEvictedJobRunIds() map[string]bool {
-	if m != nil {
-		return m.EvictedJobRunIds
-	}
-	return nil
-}
-
 func (m *Node) GetNonArmadaAllocatedResources() map[int32]ResourceList {
 	if m != nil {
 		return m.NonArmadaAllocatedResources
@@ -968,9 +941,6 @@ func init() {
 	proto.RegisterType((*Executor)(nil), "schedulerobjects.Executor")
 	proto.RegisterType((*Node)(nil), "schedulerobjects.Node")
 	proto.RegisterMapType((map[int32]ResourceList)(nil), "schedulerobjects.Node.AllocatableByPriorityAndResourceEntry")
-	proto.RegisterMapType((map[string]ResourceList)(nil), "schedulerobjects.Node.AllocatedByJobIdEntry")
-	proto.RegisterMapType((map[string]ResourceList)(nil), "schedulerobjects.Node.AllocatedByQueueEntry")
-	proto.RegisterMapType((map[string]bool)(nil), "schedulerobjects.Node.EvictedJobRunIdsEntry")
 	proto.RegisterMapType((map[string]string)(nil), "schedulerobjects.Node.LabelsEntry")
 	proto.RegisterMapType((map[int32]ResourceList)(nil), "schedulerobjects.Node.NonArmadaAllocatedResourcesEntry")
 	proto.RegisterMapType((map[string]*ResourceList)(nil), "schedulerobjects.Node.ResourceUsageByQueueEntry")
@@ -998,139 +968,133 @@ func init() {
 }
 
 var fileDescriptor_97dadc5fbd620721 = []byte{
-	// 2112 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xcf, 0x6f, 0x1b, 0xc7,
-	0xf5, 0xd7, 0x52, 0x14, 0x45, 0x3e, 0xca, 0x12, 0x35, 0xb2, 0xec, 0x15, 0x6d, 0x73, 0x19, 0xc6,
-	0xdf, 0x40, 0xf9, 0xc6, 0x21, 0x1b, 0xa5, 0x40, 0x0d, 0xb7, 0x17, 0xd1, 0x52, 0x6b, 0xaa, 0x36,
-	0x25, 0xaf, 0xa4, 0x16, 0x2d, 0xd0, 0x2c, 0x96, 0xdc, 0x11, 0xbd, 0xd1, 0x72, 0x87, 0xde, 0x9d,
-	0x55, 0xc3, 0x9e, 0xdb, 0x43, 0x11, 0x20, 0x0d, 0x8a, 0xb4, 0x0d, 0x50, 0xa0, 0x45, 0xfe, 0x89,
-	0xf6, 0xd0, 0x7f, 0xc0, 0xc7, 0x1c, 0x8b, 0x1e, 0xd8, 0xc2, 0xbe, 0xf1, 0xda, 0x7f, 0xa0, 0xd8,
-	0x99, 0x5d, 0xee, 0x70, 0x97, 0x3f, 0x94, 0xa4, 0xae, 0x4e, 0xe4, 0xbc, 0x9f, 0x9f, 0x79, 0xf3,
-	0xe6, 0xcd, 0x9b, 0x59, 0x78, 0x60, 0xda, 0x14, 0x3b, 0xb6, 0x6e, 0xd5, 0xdc, 0xf6, 0x33, 0x6c,
-	0x78, 0x16, 0x76, 0xa2, 0x7f, 0xa4, 0xf5, 0x21, 0x6e, 0x53, 0x37, 0x41, 0xa8, 0xf6, 0x1c, 0x42,
-	0x09, 0x2a, 0xc4, 0xe9, 0x45, 0xa5, 0x43, 0x48, 0xc7, 0xc2, 0x35, 0xc6, 0x6f, 0x79, 0x67, 0x35,
-	0x6a, 0x76, 0xb1, 0x4b, 0xf5, 0x6e, 0x8f, 0xab, 0x14, 0x2b, 0xe7, 0xf7, 0xdd, 0xaa, 0x49, 0x6a,
-	0x7a, 0xcf, 0xac, 0xb5, 0x89, 0x83, 0x6b, 0x17, 0xef, 0xd5, 0x3a, 0xd8, 0xc6, 0x8e, 0x4e, 0xb1,
-	0x11, 0xc8, 0x7c, 0x3b, 0x92, 0xe9, 0xea, 0xed, 0x67, 0xa6, 0x8d, 0x9d, 0x7e, 0xad, 0x77, 0xde,
-	0x61, 0x4a, 0x0e, 0x76, 0x89, 0xe7, 0xb4, 0x71, 0x42, 0xeb, 0xdd, 0x8e, 0x49, 0x9f, 0x79, 0xad,
-	0x6a, 0x9b, 0x74, 0x6b, 0x1d, 0xd2, 0x21, 0x11, 0x06, 0x7f, 0xc4, 0x06, 0xec, 0x1f, 0x17, 0xaf,
-	0xbc, 0x48, 0x41, 0x76, 0xff, 0x23, 0xdc, 0xf6, 0x28, 0x71, 0x50, 0x19, 0x52, 0xa6, 0x21, 0x4b,
-	0x65, 0x69, 0x3b, 0x57, 0x2f, 0x0c, 0x07, 0xca, 0x8a, 0x69, 0xdc, 0x23, 0x5d, 0x93, 0xe2, 0x6e,
-	0x8f, 0xf6, 0xd5, 0x94, 0x69, 0xa0, 0xb7, 0x20, 0xdd, 0x23, 0xc4, 0x92, 0x53, 0x4c, 0x06, 0x0d,
-	0x07, 0xca, 0xaa, 0x3f, 0x16, 0xa4, 0x18, 0x1f, 0xed, 0xc2, 0x92, 0x4d, 0x0c, 0xec, 0xca, 0x8b,
-	0xe5, 0xc5, 0xed, 0xfc, 0xce, 0x8d, 0x6a, 0x22, 0x74, 0x4d, 0x62, 0xe0, 0xfa, 0xc6, 0x70, 0xa0,
-	0xac, 0x31, 0x41, 0xc1, 0x02, 0xd7, 0x44, 0x1f, 0xc0, 0xaa, 0xa5, 0xbb, 0xf4, 0xb4, 0x67, 0xe8,
-	0x14, 0x9f, 0x98, 0x5d, 0x2c, 0x2f, 0x95, 0xa5, 0xed, 0xfc, 0x4e, 0xb1, 0xca, 0x83, 0x5b, 0x0d,
-	0x27, 0x56, 0x3d, 0x09, 0x83, 0x5b, 0x2f, 0xbe, 0x18, 0x28, 0x0b, 0x3e, 0xa8, 0x71, 0xcd, 0x4f,
-	0xff, 0xa9, 0x48, 0x6a, 0x8c, 0x86, 0x0e, 0x61, 0xc3, 0xb3, 0x75, 0xd7, 0x35, 0x3b, 0x36, 0x36,
-	0xb4, 0x0f, 0x49, 0x4b, 0x73, 0x3c, 0xdb, 0x95, 0x73, 0xe5, 0xc5, 0xed, 0x5c, 0x5d, 0x19, 0x0e,
-	0x94, 0x5b, 0x11, 0xfb, 0x80, 0xb4, 0x54, 0xcf, 0x16, 0x41, 0xae, 0x27, 0x98, 0x95, 0x7f, 0x6c,
-	0x42, 0xda, 0x9f, 0xd5, 0xe5, 0xc2, 0x68, 0xeb, 0x5d, 0x2c, 0xaf, 0x44, 0x61, 0xf4, 0xc7, 0x62,
-	0x18, 0xfd, 0x31, 0xda, 0x81, 0x2c, 0x0e, 0x16, 0x47, 0xde, 0x60, 0xb2, 0x37, 0x86, 0x03, 0x05,
-	0x85, 0x34, 0x41, 0x7e, 0x24, 0x87, 0x9e, 0x40, 0xce, 0x9f, 0xa9, 0xe6, 0x62, 0x6c, 0xb3, 0x75,
-	0x9a, 0x1d, 0xb2, 0xeb, 0x41, 0xc8, 0xb2, 0xbe, 0xd2, 0x31, 0xc6, 0x36, 0x0b, 0xd6, 0x68, 0x84,
-	0x0e, 0x21, 0xe7, 0xaf, 0x87, 0x46, 0xfb, 0x3d, 0x2c, 0x2f, 0x06, 0xe6, 0x26, 0xae, 0xe6, 0x49,
-	0xbf, 0x87, 0x39, 0x3e, 0x3b, 0x18, 0x89, 0xf8, 0x42, 0x1a, 0xda, 0x85, 0x0c, 0xd5, 0x4d, 0x9b,
-	0xba, 0xf2, 0x12, 0xcb, 0x8d, 0xad, 0x2a, 0xcf, 0xf3, 0xaa, 0xde, 0x33, 0xab, 0xfe, 0x5e, 0xa8,
-	0x5e, 0xbc, 0x57, 0x3d, 0xf1, 0x25, 0xea, 0xab, 0x01, 0xb6, 0x40, 0x41, 0x0d, 0x7e, 0xd1, 0x11,
-	0x64, 0x2c, 0xbd, 0x85, 0x2d, 0x57, 0xce, 0x30, 0x13, 0x95, 0xc9, 0x80, 0xaa, 0x8f, 0x99, 0xd0,
-	0xbe, 0x4d, 0x9d, 0x7e, 0xfd, 0xfa, 0x70, 0xa0, 0x14, 0xb8, 0x96, 0x00, 0x2b, 0xb0, 0x83, 0x34,
-	0x58, 0xa3, 0x84, 0xea, 0x96, 0x16, 0xee, 0x2b, 0x57, 0x5e, 0x66, 0x73, 0x2d, 0x25, 0x4d, 0xab,
-	0x81, 0xc8, 0x63, 0xd3, 0xa5, 0xf5, 0x1b, 0x61, 0xc6, 0x31, 0xf5, 0x90, 0xe5, 0xaa, 0xb1, 0x31,
-	0xfa, 0x8b, 0x04, 0x77, 0x75, 0xcb, 0x22, 0x6d, 0x9d, 0xea, 0x2d, 0x0b, 0x6b, 0xad, 0xbe, 0xd6,
-	0x73, 0x4c, 0xe2, 0x98, 0xb4, 0xaf, 0xe9, 0xb6, 0x31, 0xf2, 0x2b, 0x67, 0xd9, 0x8c, 0xbe, 0x37,
-	0x65, 0x46, 0xbb, 0x91, 0x89, 0x7a, 0xff, 0x28, 0x30, 0xb0, 0x6b, 0x1b, 0xa1, 0x23, 0x3e, 0xd7,
-	0xed, 0x00, 0x54, 0x59, 0x9f, 0x23, 0xae, 0xce, 0x95, 0x40, 0x0e, 0x6c, 0xb8, 0x54, 0xa7, 0x0c,
-	0x71, 0xb0, 0x49, 0x34, 0xd3, 0x60, 0xdb, 0x24, 0xbf, 0xf3, 0xce, 0x14, 0x98, 0xc7, 0xbe, 0x46,
-	0xbd, 0xcf, 0x77, 0x46, 0xc3, 0xe0, 0xa8, 0x6e, 0x06, 0xa8, 0xd6, 0xdc, 0x71, 0xae, 0x1a, 0x27,
-	0x20, 0x0f, 0x36, 0x02, 0x5c, 0xd8, 0x08, 0xfd, 0x9a, 0x86, 0x0c, 0xcc, 0xe7, 0xbd, 0xd9, 0xa1,
-	0xc1, 0x06, 0x33, 0x14, 0x3a, 0x95, 0x03, 0xa7, 0x05, 0x3d, 0xc6, 0x56, 0x13, 0x14, 0x44, 0x01,
-	0x8d, 0xb9, 0x7d, 0xee, 0x61, 0x0f, 0xcb, 0xf9, 0xcb, 0x7a, 0x7d, 0xea, 0x8b, 0x4f, 0xf7, 0xca,
-	0xd8, 0x6a, 0x82, 0xe2, 0x4f, 0x16, 0x5f, 0x98, 0x6d, 0x1a, 0x15, 0x21, 0xcd, 0x34, 0x5c, 0x79,
-	0x75, 0xa6, 0xdb, 0x7d, 0xae, 0x11, 0x46, 0xcc, 0x8d, 0xb9, 0xc5, 0x31, 0xb6, 0x9a, 0xa0, 0xa0,
-	0x2f, 0x24, 0x28, 0xd9, 0xc4, 0xd6, 0x74, 0xa7, 0xab, 0x1b, 0xba, 0x16, 0x4d, 0x3c, 0xda, 0x01,
-	0xd7, 0x18, 0x84, 0xef, 0x4c, 0x81, 0xd0, 0x24, 0xf6, 0x2e, 0xd3, 0x1d, 0x85, 0x60, 0x94, 0xed,
-	0x1c, 0xcd, 0x9b, 0x01, 0x9a, 0x5b, 0xf6, 0x74, 0x49, 0x75, 0x16, 0x13, 0xed, 0xc2, 0x35, 0xcf,
-	0x0e, 0xbc, 0xfb, 0x19, 0x2a, 0xaf, 0x95, 0xa5, 0xed, 0x6c, 0xfd, 0xd6, 0x70, 0xa0, 0xdc, 0x1c,
-	0x63, 0x08, 0x3b, 0x7a, 0x5c, 0x03, 0x7d, 0x2c, 0xc1, 0xcd, 0x70, 0x46, 0x9a, 0xe7, 0xea, 0x1d,
-	0x1c, 0xad, 0x6c, 0x81, 0xcd, 0xef, 0x5b, 0x53, 0xe6, 0x17, 0xc2, 0x38, 0xf5, 0x95, 0xc6, 0x56,
-	0xb7, 0x32, 0x1c, 0x28, 0x25, 0x67, 0x02, 0x5b, 0x80, 0x71, 0x7d, 0x12, 0xdf, 0x3f, 0x73, 0x1c,
-	0xdc, 0x23, 0x0e, 0x35, 0xed, 0x8e, 0x16, 0x95, 0xd5, 0x75, 0x56, 0xda, 0xd9, 0x99, 0x33, 0x62,
-	0x37, 0x93, 0x35, 0x74, 0x3d, 0xc1, 0x1c, 0x9d, 0xc7, 0x68, 0xf6, 0x79, 0x5c, 0xd4, 0x21, 0x2f,
-	0x14, 0x43, 0xf4, 0x26, 0x2c, 0x9e, 0xe3, 0x7e, 0x70, 0x44, 0xad, 0x0f, 0x07, 0xca, 0xb5, 0x73,
-	0xdc, 0x17, 0x94, 0x7c, 0x2e, 0x7a, 0x1b, 0x96, 0x2e, 0x74, 0xcb, 0xc3, 0xc1, 0x61, 0xcf, 0xce,
-	0x6a, 0x46, 0x10, 0xcf, 0x6a, 0x46, 0x78, 0x90, 0xba, 0x2f, 0x15, 0xff, 0x28, 0xc1, 0xff, 0x5d,
-	0xaa, 0x3c, 0x89, 0xde, 0x97, 0xa6, 0x7a, 0x6f, 0x88, 0xde, 0xe7, 0xd7, 0xe1, 0x79, 0xe8, 0x7e,
-	0x2d, 0xc1, 0xf5, 0x49, 0x55, 0xe9, 0x72, 0xa1, 0x78, 0x24, 0x82, 0x59, 0xdd, 0xb9, 0x93, 0x04,
-	0xc3, 0x8d, 0x72, 0x0f, 0xf3, 0xb0, 0x7c, 0x2c, 0xc1, 0xe6, 0xc4, 0x6a, 0x75, 0x39, 0x30, 0xff,
-	0xe5, 0xc8, 0xc4, 0xd0, 0x44, 0x79, 0x7e, 0x25, 0x68, 0xce, 0x61, 0x73, 0x62, 0x6d, 0xfb, 0x1a,
-	0x29, 0x9b, 0x9d, 0xeb, 0xec, 0xf7, 0x12, 0x94, 0xe7, 0x95, 0xb1, 0x2b, 0xc9, 0xd6, 0xdf, 0x48,
-	0xb0, 0x35, 0xb5, 0xfe, 0x5c, 0xc5, 0xba, 0x54, 0xfe, 0x94, 0x86, 0xec, 0xa8, 0xea, 0x94, 0x21,
-	0xd5, 0xe0, 0x0d, 0x6e, 0x9a, 0x37, 0xb8, 0x8d, 0xb1, 0x06, 0xb7, 0x61, 0x08, 0x4d, 0x5e, 0xea,
-	0xeb, 0x36, 0x79, 0x27, 0xa3, 0x26, 0x8f, 0xdf, 0x21, 0xde, 0x9a, 0xde, 0x75, 0x7e, 0x85, 0x46,
-	0xef, 0x97, 0x12, 0x20, 0xcf, 0x76, 0x31, 0x6d, 0xd8, 0x06, 0xfe, 0x08, 0x1b, 0x5c, 0x53, 0x4e,
-	0x33, 0x17, 0x3b, 0x33, 0x5c, 0x9c, 0x26, 0x94, 0xb8, 0xbb, 0xf2, 0x70, 0xa0, 0xdc, 0x4e, 0x5a,
-	0x14, 0x5c, 0x4f, 0xf0, 0xf7, 0xbf, 0xa8, 0xc7, 0x5d, 0xb8, 0x39, 0x05, 0xf3, 0xeb, 0x70, 0x57,
-	0x79, 0x91, 0x81, 0x2d, 0x96, 0xa3, 0x0f, 0x2d, 0xcf, 0xa5, 0xd8, 0x19, 0x4b, 0x5f, 0xd4, 0x80,
-	0xe5, 0xb6, 0x83, 0xfd, 0xdd, 0xc5, 0xbc, 0xce, 0xbe, 0x92, 0x6c, 0x04, 0x19, 0x11, 0xaa, 0xb0,
-	0x1b, 0x49, 0x38, 0xf0, 0x71, 0xf1, 0xe3, 0x5b, 0xc0, 0xf5, 0x3c, 0x76, 0xfa, 0x72, 0x09, 0x74,
-	0x1f, 0x20, 0xbc, 0x16, 0x35, 0x0c, 0x76, 0x79, 0xc9, 0xd5, 0xe5, 0xe1, 0x40, 0xb9, 0x1e, 0x51,
-	0x05, 0x25, 0x41, 0x16, 0xfd, 0x4e, 0xf2, 0x4f, 0xea, 0xa0, 0x0e, 0x44, 0x47, 0x59, 0x90, 0x27,
-	0x7b, 0xc9, 0x3c, 0x99, 0x3a, 0xf5, 0xd1, 0x36, 0x13, 0xcc, 0xf0, 0xcc, 0xb9, 0x13, 0x4c, 0x73,
-	0xa2, 0x23, 0x49, 0x9d, 0x44, 0x46, 0x7f, 0x95, 0xe0, 0xf6, 0x04, 0xfa, 0x43, 0x4b, 0x77, 0xdd,
-	0xa6, 0xce, 0xee, 0xc8, 0x3e, 0xc0, 0x27, 0xdf, 0x10, 0xe0, 0xc8, 0x1e, 0x47, 0x7a, 0x37, 0x40,
-	0x3a, 0xd3, 0xb5, 0x3a, 0x93, 0x5b, 0xfc, 0x44, 0x02, 0x79, 0x5a, 0x28, 0xae, 0xa4, 0xc6, 0xfe,
-	0x41, 0x82, 0x37, 0xe6, 0x4e, 0xfd, 0x4a, 0x6a, 0xed, 0xdf, 0x16, 0xa1, 0x38, 0x69, 0xa5, 0x54,
-	0xd6, 0xfe, 0x8d, 0x7a, 0x3e, 0x69, 0xce, 0x1b, 0x8c, 0xb0, 0xe7, 0x52, 0xdf, 0x70, 0xcf, 0x7d,
-	0x22, 0x41, 0x41, 0x58, 0x5d, 0x96, 0x4b, 0x41, 0x59, 0xae, 0x27, 0x27, 0x3b, 0x1d, 0xbb, 0x98,
-	0x6b, 0x42, 0x43, 0x5d, 0x1a, 0x0e, 0x94, 0x62, 0xdc, 0xbe, 0x30, 0x9f, 0x84, 0xef, 0xe2, 0xe7,
-	0x12, 0x6c, 0x4e, 0xb4, 0x75, 0xb9, 0x05, 0xfb, 0xd1, 0xf8, 0x82, 0xbd, 0xf3, 0x15, 0xb6, 0xcb,
-	0xdc, 0xd5, 0xfb, 0x55, 0x0a, 0x56, 0xc4, 0xe5, 0x46, 0x1f, 0x40, 0x2e, 0xba, 0x53, 0x49, 0x2c,
-	0x68, 0xef, 0xce, 0xce, 0x90, 0x6a, 0xec, 0x26, 0xb5, 0x1e, 0x2c, 0x4e, 0x64, 0x47, 0x8d, 0xfe,
-	0x16, 0x3f, 0x93, 0x60, 0x75, 0x7a, 0xcf, 0x32, 0x3d, 0x08, 0x3f, 0x19, 0x0f, 0x42, 0x55, 0x38,
-	0xa2, 0x47, 0xef, 0x8d, 0xd5, 0xde, 0x79, 0x87, 0x9d, 0xd9, 0xa1, 0xbb, 0xea, 0x53, 0x4f, 0xb7,
-	0xa9, 0x49, 0xfb, 0x73, 0xe3, 0xf0, 0xd9, 0x12, 0xac, 0x1f, 0x90, 0xd6, 0x31, 0x9f, 0xa8, 0x69,
-	0x77, 0x1a, 0xf6, 0x19, 0x41, 0x3b, 0x90, 0xb5, 0xcc, 0x33, 0x4c, 0xcd, 0x2e, 0x66, 0xf0, 0xae,
-	0xf1, 0x17, 0xa3, 0x90, 0x26, 0xbe, 0x18, 0x85, 0x34, 0xf4, 0x00, 0x56, 0x74, 0xaa, 0x75, 0x89,
-	0x4b, 0x35, 0x62, 0xb7, 0xc3, 0xe6, 0x8e, 0x15, 0x72, 0x9d, 0x3e, 0x21, 0x2e, 0x3d, 0xb4, 0xdb,
-	0xa2, 0x26, 0x44, 0x54, 0xf4, 0x5d, 0xc8, 0xf7, 0x1c, 0xec, 0xd3, 0x4d, 0xff, 0x02, 0xb9, 0xc8,
-	0x54, 0xb7, 0x86, 0x03, 0x65, 0x53, 0x20, 0x0b, 0xba, 0xa2, 0x34, 0x7a, 0x04, 0x85, 0x36, 0xb1,
-	0xdb, 0x9e, 0xe3, 0x60, 0xbb, 0xdd, 0xd7, 0x5c, 0xfd, 0x0c, 0xcb, 0x69, 0x66, 0xe1, 0xce, 0x70,
-	0xa0, 0x6c, 0x09, 0xbc, 0x63, 0xfd, 0x4c, 0xb4, 0xb2, 0x16, 0x63, 0xf9, 0x17, 0xbf, 0xd1, 0x73,
-	0x4f, 0xdb, 0xaf, 0x30, 0x1a, 0x7b, 0xff, 0xcb, 0x44, 0x17, 0xbf, 0x5e, 0xbc, 0xfe, 0x88, 0x17,
-	0xbf, 0x04, 0x13, 0x1d, 0x43, 0xde, 0xf5, 0x5a, 0x5d, 0x93, 0x6a, 0x2c, 0x94, 0xcb, 0x73, 0x37,
-	0x78, 0xf8, 0x50, 0x05, 0x5c, 0x6d, 0xf4, 0x2c, 0x2a, 0x8c, 0xfd, 0xc5, 0x09, 0x3d, 0xc9, 0xd9,
-	0x68, 0x71, 0x42, 0x9a, 0xb8, 0x38, 0x21, 0x0d, 0xfd, 0x1c, 0x36, 0x78, 0x0a, 0x6b, 0x0e, 0x7e,
-	0xee, 0x99, 0x0e, 0xee, 0xe2, 0xe8, 0x6d, 0xef, 0x6e, 0x32, 0xcf, 0x0f, 0xd9, 0xaf, 0x2a, 0xc8,
-	0xf2, 0x16, 0x8a, 0x24, 0xe8, 0x62, 0x0b, 0x95, 0xe4, 0xa2, 0x1a, 0x2c, 0x5f, 0x60, 0xc7, 0x35,
-	0x89, 0x2d, 0xe7, 0x18, 0xd6, 0xcd, 0xe1, 0x40, 0x59, 0x0f, 0x48, 0x82, 0x6e, 0x28, 0xf5, 0x20,
-	0xfd, 0xf9, 0x17, 0x8a, 0x54, 0xf9, 0xad, 0x04, 0x28, 0x89, 0x01, 0x59, 0xb0, 0xd6, 0x23, 0x86,
-	0x48, 0x0a, 0x1a, 0x95, 0x37, 0x92, 0x53, 0x38, 0x1a, 0x17, 0xe4, 0xc9, 0x10, 0xd3, 0x8e, 0x00,
-	0x3c, 0x5a, 0x50, 0xe3, 0xa6, 0xeb, 0xab, 0xb0, 0x22, 0x46, 0xab, 0xf2, 0xef, 0x0c, 0xac, 0xc5,
-	0xac, 0x22, 0x17, 0x56, 0x6c, 0x62, 0xe0, 0x63, 0x6c, 0xe1, 0x36, 0x25, 0x4e, 0x50, 0x39, 0xde,
-	0x9f, 0x0b, 0x87, 0xb5, 0xac, 0xa1, 0x16, 0xaf, 0x1f, 0xc5, 0xe1, 0x40, 0xb9, 0x21, 0x1a, 0x13,
-	0xc2, 0x33, 0xe6, 0x04, 0x1d, 0x41, 0x56, 0x3f, 0x3b, 0x33, 0x6d, 0x3f, 0x03, 0x78, 0x59, 0xb8,
-	0x3d, 0xa9, 0x73, 0xdf, 0x0d, 0x64, 0x78, 0x7e, 0x84, 0x1a, 0x62, 0x7e, 0x84, 0x34, 0x74, 0x0a,
-	0x79, 0x4a, 0x2c, 0xec, 0xe8, 0xd4, 0x24, 0x76, 0xd8, 0xcb, 0x97, 0x26, 0x5e, 0x07, 0x46, 0x62,
-	0xa3, 0xd3, 0x48, 0x54, 0x55, 0xc5, 0x01, 0x22, 0x90, 0xd7, 0x6d, 0x9b, 0xd0, 0xc0, 0xec, 0xf2,
-	0xb4, 0xfe, 0x3d, 0x1e, 0x9c, 0xdd, 0x48, 0x89, 0xc7, 0x86, 0xd5, 0x02, 0xc1, 0x94, 0x58, 0x0b,
-	0x04, 0xf2, 0xd8, 0xde, 0x48, 0xb3, 0x3e, 0x65, 0xfe, 0xde, 0x38, 0x80, 0x42, 0x58, 0x4e, 0x88,
-	0x7d, 0x44, 0x2c, 0xb3, 0xdd, 0x67, 0x1f, 0x31, 0x72, 0xfc, 0xc4, 0x8b, 0xf3, 0xc4, 0x13, 0x2f,
-	0xce, 0x43, 0xbf, 0x80, 0xd1, 0x93, 0xd2, 0x58, 0x96, 0x66, 0xd8, 0x2a, 0x6d, 0x4f, 0x0a, 0xa8,
-	0x3a, 0x41, 0xbe, 0x7e, 0x3b, 0x08, 0xed, 0x44, 0x6b, 0xea, 0x44, 0x6a, 0xb1, 0x03, 0xeb, 0x89,
-	0xa4, 0x7a, 0x2d, 0x77, 0x96, 0x33, 0x28, 0xc4, 0x17, 0xe8, 0x75, 0xf8, 0x39, 0x48, 0x67, 0xb3,
-	0x85, 0x5c, 0xe5, 0xcf, 0x12, 0x6c, 0x1d, 0x79, 0x96, 0xab, 0x3b, 0xc7, 0x61, 0xda, 0x1c, 0x90,
-	0xd6, 0x1e, 0xa6, 0xba, 0x69, 0xb9, 0xbe, 0x49, 0xf6, 0x32, 0x13, 0x78, 0x66, 0x26, 0x19, 0x41,
-	0x34, 0xc9, 0x1f, 0x8e, 0xdf, 0x86, 0xa5, 0xa7, 0xf1, 0x2b, 0x49, 0xbc, 0x87, 0xe1, 0x12, 0xe8,
-	0x1e, 0x64, 0xfc, 0x43, 0x11, 0xd3, 0xe0, 0x3a, 0xc2, 0x6e, 0xab, 0x9c, 0x22, 0xde, 0x56, 0x39,
-	0xe5, 0xff, 0x0f, 0x21, 0x2f, 0x3c, 0x2c, 0xa1, 0x3c, 0x2c, 0x9f, 0x36, 0x7f, 0xd8, 0x3c, 0xfc,
-	0x71, 0xb3, 0xb0, 0xe0, 0x0f, 0x8e, 0xf6, 0x9b, 0x7b, 0x8d, 0xe6, 0x0f, 0x0a, 0x92, 0x3f, 0x50,
-	0x4f, 0x9b, 0x4d, 0x7f, 0x90, 0x42, 0xd7, 0x20, 0x77, 0x7c, 0xfa, 0xf0, 0xe1, 0xfe, 0xfe, 0xde,
-	0xfe, 0x5e, 0x61, 0x11, 0x01, 0x64, 0xbe, 0xbf, 0xdb, 0x78, 0xbc, 0xbf, 0x57, 0x48, 0xd7, 0x7f,
-	0xf6, 0xe2, 0x65, 0x49, 0xfa, 0xf2, 0x65, 0x49, 0xfa, 0xd7, 0xcb, 0x92, 0xf4, 0xe9, 0xab, 0xd2,
-	0xc2, 0x97, 0xaf, 0x4a, 0x0b, 0x7f, 0x7f, 0x55, 0x5a, 0xf8, 0xe9, 0x43, 0xe1, 0xbb, 0x21, 0x7f,
-	0x13, 0xee, 0x39, 0xc4, 0xdf, 0x43, 0xc1, 0xa8, 0x76, 0x89, 0x0f, 0xa4, 0xad, 0x0c, 0x3b, 0x78,
-	0xde, 0xff, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x60, 0xc7, 0xf2, 0x04, 0x4e, 0x1d, 0x00, 0x00,
+	// 2002 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x19, 0x5f, 0x6f, 0x1b, 0x49,
+	0x3d, 0xeb, 0x38, 0x8e, 0x3d, 0xce, 0x1f, 0x67, 0x92, 0xb6, 0x1b, 0xb7, 0xf5, 0xfa, 0x7c, 0xe5,
+	0x14, 0xb8, 0x3b, 0x9b, 0xcb, 0x21, 0x51, 0x15, 0x5e, 0xec, 0x24, 0x50, 0x87, 0xd6, 0x49, 0x37,
+	0x09, 0x08, 0x24, 0x6e, 0x35, 0xf6, 0x4e, 0xdc, 0xbd, 0xac, 0x67, 0xdc, 0xdd, 0xd9, 0x72, 0xe6,
+	0x19, 0x1e, 0x10, 0xd2, 0x71, 0x42, 0x07, 0x9c, 0x84, 0x04, 0xba, 0x2f, 0x01, 0x0f, 0x7c, 0x81,
+	0x3c, 0xde, 0x23, 0x4f, 0x06, 0xb5, 0x6f, 0x96, 0x78, 0xe2, 0x0b, 0xa0, 0x99, 0xd9, 0xb5, 0xc7,
+	0x5e, 0x3b, 0xce, 0x71, 0x94, 0x3e, 0xc5, 0xf3, 0xfb, 0x3f, 0xbf, 0xf9, 0xfd, 0xdd, 0x80, 0x07,
+	0x0e, 0x61, 0xd8, 0x23, 0xc8, 0xad, 0xf8, 0xad, 0xa7, 0xd8, 0x0e, 0x5c, 0xec, 0x8d, 0x7e, 0xd1,
+	0xe6, 0x87, 0xb8, 0xc5, 0xfc, 0x18, 0xa0, 0xdc, 0xf5, 0x28, 0xa3, 0x30, 0x37, 0x09, 0xcf, 0x1b,
+	0x6d, 0x4a, 0xdb, 0x2e, 0xae, 0x08, 0x7c, 0x33, 0x38, 0xaf, 0x30, 0xa7, 0x83, 0x7d, 0x86, 0x3a,
+	0x5d, 0xc9, 0x92, 0x2f, 0x5d, 0xdc, 0xf7, 0xcb, 0x0e, 0xad, 0xa0, 0xae, 0x53, 0x69, 0x51, 0x0f,
+	0x57, 0x9e, 0xbf, 0x57, 0x69, 0x63, 0x82, 0x3d, 0xc4, 0xb0, 0x1d, 0xd2, 0x7c, 0x6b, 0x44, 0xd3,
+	0x41, 0xad, 0xa7, 0x0e, 0xc1, 0x5e, 0xaf, 0xd2, 0xbd, 0x68, 0x0b, 0x26, 0x0f, 0xfb, 0x34, 0xf0,
+	0x5a, 0x38, 0xc6, 0xf5, 0x6e, 0xdb, 0x61, 0x4f, 0x83, 0x66, 0xb9, 0x45, 0x3b, 0x95, 0x36, 0x6d,
+	0xd3, 0x91, 0x0d, 0xfc, 0x24, 0x0e, 0xe2, 0x97, 0x24, 0x2f, 0x5d, 0x26, 0x40, 0xfa, 0xe0, 0x23,
+	0xdc, 0x0a, 0x18, 0xf5, 0x60, 0x11, 0x24, 0x1c, 0x5b, 0xd7, 0x8a, 0xda, 0x4e, 0xa6, 0x96, 0x1b,
+	0xf4, 0x8d, 0x15, 0xc7, 0x7e, 0x87, 0x76, 0x1c, 0x86, 0x3b, 0x5d, 0xd6, 0x33, 0x13, 0x8e, 0x0d,
+	0xdf, 0x02, 0xc9, 0x2e, 0xa5, 0xae, 0x9e, 0x10, 0x34, 0x70, 0xd0, 0x37, 0xd6, 0xf8, 0x59, 0xa1,
+	0x12, 0x78, 0x58, 0x05, 0x4b, 0x84, 0xda, 0xd8, 0xd7, 0x17, 0x8b, 0x8b, 0x3b, 0xd9, 0xdd, 0x9b,
+	0xe5, 0x98, 0xeb, 0x1a, 0xd4, 0xc6, 0xb5, 0xcd, 0x41, 0xdf, 0x58, 0x17, 0x84, 0x8a, 0x04, 0xc9,
+	0x09, 0x3f, 0x00, 0x6b, 0x2e, 0xf2, 0xd9, 0x59, 0xd7, 0x46, 0x0c, 0x9f, 0x3a, 0x1d, 0xac, 0x2f,
+	0x15, 0xb5, 0x9d, 0xec, 0x6e, 0xbe, 0x2c, 0x9d, 0x5b, 0x8e, 0x2e, 0x56, 0x3e, 0x8d, 0x9c, 0x5b,
+	0xcb, 0x5f, 0xf6, 0x8d, 0x05, 0x6e, 0xd4, 0x38, 0xe7, 0x27, 0xff, 0x30, 0x34, 0x73, 0x02, 0x06,
+	0x8f, 0xc0, 0x66, 0x40, 0x90, 0xef, 0x3b, 0x6d, 0x82, 0x6d, 0xeb, 0x43, 0xda, 0xb4, 0xbc, 0x80,
+	0xf8, 0x7a, 0xa6, 0xb8, 0xb8, 0x93, 0xa9, 0x19, 0x83, 0xbe, 0x71, 0x7b, 0x84, 0x3e, 0xa4, 0x4d,
+	0x33, 0x20, 0xaa, 0x91, 0x1b, 0x31, 0x64, 0xe9, 0x5f, 0xeb, 0x20, 0xc9, 0x6f, 0x75, 0x3d, 0x37,
+	0x12, 0xd4, 0xc1, 0xfa, 0xca, 0xc8, 0x8d, 0xfc, 0xac, 0xba, 0x91, 0x9f, 0xe1, 0x2e, 0x48, 0xe3,
+	0xf0, 0x71, 0xf4, 0x4d, 0x41, 0x7b, 0x73, 0xd0, 0x37, 0x60, 0x04, 0x53, 0xe8, 0x87, 0x74, 0xf0,
+	0x31, 0xc8, 0xf0, 0x9b, 0x5a, 0x3e, 0xc6, 0x44, 0xbc, 0xd3, 0xd5, 0x2e, 0xdb, 0x0a, 0x5d, 0x96,
+	0xe6, 0x4c, 0x27, 0x18, 0x13, 0xe1, 0xac, 0xe1, 0x09, 0x1e, 0x81, 0x0c, 0x7f, 0x0f, 0x8b, 0xf5,
+	0xba, 0x58, 0x5f, 0x0c, 0xc5, 0x4d, 0x7d, 0xcd, 0xd3, 0x5e, 0x17, 0x4b, 0xfb, 0x48, 0x78, 0x52,
+	0xed, 0x8b, 0x60, 0xb0, 0x0a, 0x52, 0x0c, 0x39, 0x84, 0xf9, 0xfa, 0x92, 0x88, 0x8d, 0xed, 0xb2,
+	0x8c, 0xf3, 0x32, 0xea, 0x3a, 0x65, 0x9e, 0x0b, 0xe5, 0xe7, 0xef, 0x95, 0x4f, 0x39, 0x45, 0x6d,
+	0x2d, 0xb4, 0x2d, 0x64, 0x30, 0xc3, 0xbf, 0xf0, 0x18, 0xa4, 0x5c, 0xd4, 0xc4, 0xae, 0xaf, 0xa7,
+	0x84, 0x88, 0xd2, 0x74, 0x83, 0xca, 0x8f, 0x04, 0xd1, 0x01, 0x61, 0x5e, 0xaf, 0xb6, 0x35, 0xe8,
+	0x1b, 0x39, 0xc9, 0xa5, 0x98, 0x15, 0xca, 0x81, 0x16, 0x58, 0x67, 0x94, 0x21, 0xd7, 0x8a, 0xf2,
+	0xca, 0xd7, 0x97, 0xc5, 0x5d, 0x0b, 0x71, 0xd1, 0x66, 0x48, 0xf2, 0xc8, 0xf1, 0x59, 0xed, 0x66,
+	0x14, 0x71, 0x82, 0x3d, 0x42, 0xf9, 0xe6, 0xc4, 0x19, 0xfe, 0x45, 0x03, 0xf7, 0x90, 0xeb, 0xd2,
+	0x16, 0x62, 0xa8, 0xe9, 0x62, 0xab, 0xd9, 0xb3, 0xba, 0x9e, 0x43, 0x3d, 0x87, 0xf5, 0x2c, 0x44,
+	0xec, 0xa1, 0x5e, 0x3d, 0x2d, 0x6e, 0xf4, 0xdd, 0x19, 0x37, 0xaa, 0x8e, 0x44, 0xd4, 0x7a, 0xc7,
+	0xa1, 0x80, 0x2a, 0xb1, 0x23, 0x45, 0xf2, 0xae, 0x3b, 0xa1, 0x51, 0x45, 0x34, 0x87, 0xdc, 0x9c,
+	0x4b, 0x01, 0x3d, 0xb0, 0xe9, 0x33, 0xc4, 0x84, 0xc5, 0x61, 0x92, 0x58, 0x8e, 0x2d, 0xd2, 0x24,
+	0xbb, 0xfb, 0xf6, 0x0c, 0x33, 0x4f, 0x38, 0x47, 0xad, 0x27, 0x33, 0xa3, 0x6e, 0x4b, 0xab, 0x6e,
+	0x85, 0x56, 0xad, 0xfb, 0xe3, 0x58, 0x73, 0x12, 0x00, 0x3f, 0xd7, 0x40, 0x81, 0x50, 0x62, 0x21,
+	0xaf, 0x83, 0x6c, 0x64, 0x85, 0x36, 0x62, 0x5b, 0x79, 0x9d, 0x55, 0xa1, 0xff, 0xdb, 0x33, 0xf4,
+	0x37, 0x28, 0xa9, 0x0a, 0xde, 0x6a, 0xc4, 0x3a, 0x7c, 0x09, 0x69, 0xcb, 0x9b, 0xa1, 0x2d, 0xb7,
+	0xc9, 0x6c, 0x4a, 0xf3, 0x2a, 0x24, 0xac, 0x82, 0xd5, 0x80, 0x84, 0xda, 0xb9, 0xf7, 0xf4, 0xf5,
+	0xa2, 0xb6, 0x93, 0xae, 0xdd, 0x1e, 0xf4, 0x8d, 0x5b, 0x63, 0x08, 0x25, 0xda, 0xc6, 0x39, 0xe0,
+	0xaf, 0x35, 0x70, 0x2b, 0xba, 0x91, 0x15, 0xf8, 0xa8, 0x2d, 0x9c, 0xfc, 0x2c, 0xc0, 0x01, 0xd6,
+	0x73, 0xe2, 0x7e, 0xdf, 0x9c, 0x71, 0xbf, 0xc8, 0x8c, 0x33, 0xce, 0x54, 0xeb, 0x3d, 0xe1, 0x2c,
+	0xf2, 0x62, 0xa5, 0x41, 0xdf, 0x28, 0x78, 0x53, 0xd0, 0x8a, 0x19, 0x5b, 0xd3, 0xf0, 0xbc, 0x1e,
+	0x7a, 0xb8, 0x4b, 0x3d, 0xe6, 0x90, 0xb6, 0x35, 0x4a, 0xf9, 0x0d, 0x51, 0x76, 0x44, 0x3d, 0x1c,
+	0xa2, 0x1b, 0xf1, 0xfc, 0xde, 0x88, 0x21, 0x87, 0xbd, 0x02, 0x5e, 0xdd, 0x2b, 0xf2, 0x08, 0x64,
+	0x95, 0x44, 0x85, 0x6f, 0x82, 0xc5, 0x0b, 0xdc, 0x0b, 0xcb, 0xe7, 0xc6, 0xa0, 0x6f, 0xac, 0x5e,
+	0xe0, 0x9e, 0xc2, 0xc4, 0xb1, 0xf0, 0xeb, 0x60, 0xe9, 0x39, 0x72, 0x03, 0x1c, 0x36, 0x22, 0xd1,
+	0x47, 0x04, 0x40, 0xed, 0x23, 0x02, 0xf0, 0x20, 0x71, 0x5f, 0xcb, 0xff, 0x51, 0x03, 0x5f, 0xbb,
+	0x56, 0xea, 0xa8, 0xda, 0x97, 0x66, 0x6a, 0xaf, 0xab, 0xda, 0xe7, 0xd7, 0x88, 0x79, 0xd6, 0xfd,
+	0x4a, 0x03, 0x5b, 0xd3, 0x32, 0xe6, 0x7a, 0xae, 0x78, 0xa8, 0x1a, 0xb3, 0xb6, 0x7b, 0x37, 0x6e,
+	0x8c, 0x14, 0x2a, 0x35, 0xcc, 0xb3, 0xe5, 0xf7, 0x1a, 0x28, 0xce, 0xcb, 0x9e, 0xd7, 0xe2, 0xa4,
+	0xdf, 0x68, 0x60, 0x7b, 0x66, 0xd8, 0x5f, 0xcf, 0x53, 0xff, 0x5b, 0x8b, 0x4a, 0x7f, 0x4a, 0x82,
+	0xf4, 0x30, 0xd8, 0x8b, 0x20, 0x51, 0x97, 0x3d, 0x3f, 0x29, 0x7b, 0x7e, 0x7d, 0xac, 0xe7, 0xd7,
+	0x6d, 0xa5, 0xef, 0x25, 0xfe, 0xdb, 0xbe, 0x77, 0x3a, 0xec, 0x7b, 0x72, 0xac, 0x7a, 0x6b, 0x76,
+	0x23, 0xfe, 0x12, 0xbd, 0xef, 0x17, 0x1a, 0x80, 0x01, 0xf1, 0x31, 0xab, 0x13, 0x1b, 0x7f, 0x84,
+	0x6d, 0xc9, 0xa9, 0x27, 0x85, 0x8a, 0xdd, 0x2b, 0x54, 0x9c, 0xc5, 0x98, 0xa4, 0xba, 0xe2, 0xa0,
+	0x6f, 0xdc, 0x89, 0x4b, 0x54, 0x54, 0x4f, 0xd1, 0xf7, 0xff, 0x28, 0x03, 0x1d, 0x70, 0x6b, 0x86,
+	0xcd, 0xaf, 0x42, 0x5d, 0xe9, 0x32, 0x05, 0xb6, 0x45, 0x8c, 0xee, 0xb9, 0x81, 0xcf, 0xb0, 0x37,
+	0x16, 0xbe, 0xb0, 0x0e, 0x96, 0x5b, 0x1e, 0xe6, 0xd9, 0x25, 0xb4, 0x5e, 0x3d, 0xa5, 0x6d, 0x86,
+	0x11, 0x11, 0xb1, 0x88, 0x21, 0x2d, 0x3a, 0x70, 0xbb, 0x64, 0xd7, 0x50, 0xec, 0x7a, 0x36, 0x51,
+	0xf4, 0x25, 0x05, 0xbc, 0x0f, 0x40, 0x34, 0x29, 0xd6, 0x6d, 0x31, 0xcf, 0x65, 0x6a, 0xfa, 0xa0,
+	0x6f, 0x6c, 0x8d, 0xa0, 0x0a, 0x93, 0x42, 0x0b, 0x7f, 0xa7, 0xf1, 0x06, 0x11, 0xd6, 0x81, 0x51,
+	0x05, 0x0d, 0xe3, 0x64, 0x3f, 0x1e, 0x27, 0x33, 0xaf, 0x3e, 0x4c, 0x33, 0x45, 0x8c, 0x8c, 0x9c,
+	0xbb, 0xe1, 0x35, 0xa7, 0x2a, 0xd2, 0xcc, 0x69, 0x60, 0xf8, 0x57, 0x0d, 0xdc, 0x99, 0x02, 0xdf,
+	0x73, 0x91, 0xef, 0x37, 0x90, 0x58, 0x1b, 0xb8, 0x81, 0x8f, 0xbf, 0xa2, 0x81, 0x43, 0x79, 0xd2,
+	0xd2, 0x7b, 0xa1, 0xa5, 0x57, 0xaa, 0x36, 0xaf, 0xc4, 0xe6, 0x3f, 0xd6, 0x80, 0x3e, 0xcb, 0x15,
+	0xaf, 0xa5, 0xc6, 0xfe, 0x41, 0x03, 0x6f, 0xcc, 0xbd, 0xfa, 0x6b, 0xa9, 0xb5, 0x7f, 0x5b, 0x04,
+	0xf9, 0x69, 0x2f, 0x65, 0x8a, 0xa9, 0x63, 0x38, 0x6a, 0x68, 0x73, 0xd6, 0x52, 0x25, 0xe7, 0x12,
+	0x5f, 0x31, 0xe7, 0x3e, 0xd6, 0x40, 0x4e, 0x79, 0x5d, 0x11, 0x4b, 0x61, 0x59, 0xae, 0xc5, 0x2f,
+	0x3b, 0xdb, 0x76, 0x35, 0xd6, 0x94, 0x39, 0xae, 0x30, 0xe8, 0x1b, 0xf9, 0x49, 0xf9, 0xca, 0x7d,
+	0x62, 0xba, 0xf3, 0x9f, 0x69, 0xe0, 0xc6, 0x54, 0x59, 0xd7, 0x7b, 0xb0, 0x1f, 0x8e, 0x3f, 0xd8,
+	0xdb, 0x5f, 0x22, 0x5d, 0xe6, 0xbe, 0xde, 0x2f, 0x13, 0x60, 0x45, 0x7d, 0x6e, 0xf8, 0x01, 0xc8,
+	0x8c, 0x46, 0x79, 0x4d, 0x38, 0xed, 0xdd, 0xab, 0x23, 0xa4, 0x3c, 0x31, 0xc0, 0x6f, 0x84, 0x8f,
+	0x33, 0x92, 0x63, 0x8e, 0x7e, 0xe6, 0x3f, 0xd5, 0xc0, 0xda, 0xec, 0x99, 0x65, 0xb6, 0x13, 0x7e,
+	0x3c, 0xee, 0x84, 0xb2, 0xd2, 0xa2, 0x87, 0x9f, 0x60, 0xca, 0xdd, 0x8b, 0xb6, 0xe8, 0xd9, 0x91,
+	0xba, 0xf2, 0x93, 0x00, 0x11, 0xe6, 0xb0, 0xde, 0x5c, 0x3f, 0x7c, 0xba, 0x04, 0x36, 0x0e, 0x69,
+	0xf3, 0x44, 0x5e, 0xd4, 0x21, 0xed, 0x3a, 0x39, 0xa7, 0x7c, 0xc9, 0x77, 0x9d, 0x73, 0xcc, 0x9c,
+	0x0e, 0x16, 0xe6, 0xad, 0xca, 0x25, 0x3a, 0x82, 0xa9, 0x4b, 0x74, 0x04, 0x83, 0x0f, 0xc0, 0x0a,
+	0x62, 0x56, 0x87, 0xfa, 0xcc, 0xa2, 0xa4, 0x25, 0xed, 0x4d, 0xcb, 0x42, 0x8e, 0xd8, 0x63, 0xea,
+	0xb3, 0x23, 0xd2, 0x52, 0x39, 0xc1, 0x08, 0x0a, 0xbf, 0x03, 0xb2, 0x5d, 0x0f, 0x73, 0xb8, 0xc3,
+	0xf7, 0x96, 0x45, 0xc1, 0xba, 0x3d, 0xe8, 0x1b, 0x37, 0x14, 0xb0, 0xc2, 0xab, 0x52, 0xc3, 0x87,
+	0x20, 0xd7, 0xa2, 0xa4, 0x15, 0x78, 0x1e, 0x26, 0xad, 0x9e, 0xe5, 0xa3, 0x73, 0xac, 0x27, 0x85,
+	0x84, 0xbb, 0x83, 0xbe, 0xb1, 0xad, 0xe0, 0x4e, 0xd0, 0xb9, 0x2a, 0x65, 0x7d, 0x02, 0xc5, 0xf7,
+	0x8d, 0xe1, 0x06, 0xdc, 0xe2, 0x15, 0xc6, 0x12, 0x9f, 0x44, 0x52, 0xa3, 0x7d, 0xa3, 0x3b, 0x59,
+	0x7f, 0xd4, 0x7d, 0x23, 0x86, 0x84, 0x27, 0x20, 0xeb, 0x07, 0xcd, 0x8e, 0xc3, 0x2c, 0xe1, 0xca,
+	0xe5, 0xb9, 0x09, 0x1e, 0xed, 0xee, 0x40, 0xb2, 0x0d, 0xbf, 0x14, 0x29, 0x67, 0xfe, 0x38, 0x91,
+	0x26, 0x3d, 0x3d, 0x7a, 0x9c, 0x08, 0xa6, 0x3e, 0x4e, 0x04, 0x83, 0x3f, 0x03, 0x9b, 0x32, 0x84,
+	0x2d, 0x0f, 0x3f, 0x0b, 0x1c, 0x0f, 0x77, 0xf0, 0xe8, 0x73, 0xc7, 0xbd, 0x78, 0x9c, 0x1f, 0x89,
+	0xbf, 0xa6, 0x42, 0x2b, 0x47, 0x28, 0x1a, 0x83, 0xab, 0x23, 0x54, 0x1c, 0x0b, 0x2b, 0x60, 0xf9,
+	0x39, 0xf6, 0x7c, 0x87, 0x12, 0x3d, 0x23, 0x6c, 0xbd, 0x31, 0xe8, 0x1b, 0x1b, 0x21, 0x48, 0xe1,
+	0x8d, 0xa8, 0x1e, 0x24, 0x3f, 0xfb, 0xdc, 0xd0, 0x4a, 0xbf, 0xd5, 0x00, 0x8c, 0xdb, 0x00, 0x5d,
+	0xb0, 0xde, 0xa5, 0xb6, 0x0a, 0x0a, 0x07, 0x95, 0x37, 0xe2, 0x57, 0x38, 0x1e, 0x27, 0x94, 0xc1,
+	0x30, 0xc1, 0x3d, 0x32, 0xe0, 0xe1, 0x82, 0x39, 0x29, 0xba, 0xb6, 0x06, 0x56, 0x54, 0x6f, 0x95,
+	0xfe, 0x9d, 0x02, 0xeb, 0x13, 0x52, 0xa1, 0x0f, 0x56, 0xf8, 0x62, 0x7a, 0x82, 0x5d, 0xdc, 0x62,
+	0xd4, 0x0b, 0x2b, 0xc7, 0xfb, 0x73, 0xcd, 0x11, 0x23, 0x6b, 0xc4, 0x25, 0xeb, 0x47, 0x7e, 0xd0,
+	0x37, 0x6e, 0xaa, 0xc2, 0x14, 0xf7, 0x8c, 0x29, 0x81, 0xc7, 0x20, 0x8d, 0xce, 0xcf, 0x1d, 0xc2,
+	0x23, 0x40, 0x96, 0x85, 0x3b, 0xd3, 0x26, 0xf7, 0x6a, 0x48, 0x23, 0xe3, 0x23, 0xe2, 0x50, 0xe3,
+	0x23, 0x82, 0xc1, 0x33, 0x90, 0x65, 0xd4, 0xc5, 0x1e, 0x62, 0x0e, 0x25, 0xd1, 0x2c, 0x5f, 0x98,
+	0xba, 0x0e, 0x0c, 0xc9, 0x86, 0xdd, 0x48, 0x65, 0x35, 0xd5, 0x03, 0xa4, 0x20, 0x8b, 0x08, 0xa1,
+	0x2c, 0x14, 0xbb, 0x3c, 0x6b, 0x7e, 0x9f, 0x74, 0x4e, 0x75, 0xc4, 0x24, 0x7d, 0x23, 0x6a, 0x81,
+	0x22, 0x4a, 0xad, 0x05, 0x0a, 0x78, 0x2c, 0x37, 0x92, 0x62, 0x4e, 0x99, 0x9f, 0x1b, 0x87, 0x20,
+	0x17, 0x95, 0x13, 0x4a, 0x8e, 0xa9, 0xeb, 0xb4, 0x7a, 0xe2, 0xbb, 0x6e, 0x46, 0x76, 0xbc, 0x49,
+	0x9c, 0xda, 0xf1, 0x26, 0x71, 0xf0, 0xe7, 0x60, 0xf8, 0x25, 0x63, 0x2c, 0x4a, 0x53, 0xe2, 0x95,
+	0x76, 0xa6, 0x39, 0xd4, 0x9c, 0x42, 0x5f, 0xbb, 0x13, 0xba, 0x76, 0xaa, 0x34, 0x73, 0x2a, 0x34,
+	0xdf, 0x06, 0x1b, 0xb1, 0xa0, 0x7a, 0x25, 0x3b, 0xcb, 0x39, 0xc8, 0x4d, 0x3e, 0xd0, 0xab, 0xd0,
+	0x73, 0x98, 0x4c, 0xa7, 0x73, 0x99, 0xd2, 0x9f, 0x35, 0xb0, 0x7d, 0x1c, 0xb8, 0x3e, 0xf2, 0x4e,
+	0xa2, 0xb0, 0x39, 0xa4, 0xcd, 0x7d, 0xcc, 0x90, 0xe3, 0xfa, 0x5c, 0xe4, 0x21, 0x6d, 0xd6, 0xa3,
+	0x6f, 0xdb, 0x42, 0xa4, 0x00, 0xa8, 0x22, 0x05, 0x80, 0x93, 0x3e, 0x99, 0x5c, 0x49, 0x26, 0x67,
+	0x18, 0x49, 0x01, 0xdf, 0x01, 0x29, 0xde, 0x14, 0x31, 0x0b, 0xd7, 0x11, 0xb1, 0xad, 0x4a, 0x88,
+	0xba, 0xad, 0x4a, 0xc8, 0x37, 0x8e, 0x40, 0x56, 0xf9, 0x9e, 0x01, 0xb3, 0x60, 0xf9, 0xac, 0xf1,
+	0x83, 0xc6, 0xd1, 0x8f, 0x1a, 0xb9, 0x05, 0x7e, 0x38, 0x3e, 0x68, 0xec, 0xd7, 0x1b, 0xdf, 0xcf,
+	0x69, 0xfc, 0x60, 0x9e, 0x35, 0x1a, 0xfc, 0x90, 0x80, 0xab, 0x20, 0x73, 0x72, 0xb6, 0xb7, 0x77,
+	0x70, 0xb0, 0x7f, 0xb0, 0x9f, 0x5b, 0x84, 0x00, 0xa4, 0xbe, 0x57, 0xad, 0x3f, 0x3a, 0xd8, 0xcf,
+	0x25, 0x6b, 0x3f, 0xbd, 0x7c, 0x51, 0xd0, 0xbe, 0x78, 0x51, 0xd0, 0xfe, 0xf9, 0xa2, 0xa0, 0x7d,
+	0xf2, 0xb2, 0xb0, 0xf0, 0xc5, 0xcb, 0xc2, 0xc2, 0xdf, 0x5f, 0x16, 0x16, 0x7e, 0xb2, 0xa7, 0xfc,
+	0x2b, 0x45, 0x7e, 0x8a, 0xec, 0x7a, 0x94, 0xe7, 0x50, 0x78, 0xaa, 0x5c, 0xe3, 0x7f, 0x46, 0xcd,
+	0x94, 0x68, 0x3c, 0xef, 0xff, 0x27, 0x00, 0x00, 0xff, 0xff, 0x36, 0x09, 0x6b, 0x53, 0x61, 0x1a,
+	0x00, 0x00,
 }
 
 func (m *Executor) Marshal() (dAtA []byte, err error) {
@@ -1286,28 +1250,6 @@ func (m *Node) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		i--
 		dAtA[i] = 0x78
 	}
-	if len(m.EvictedJobRunIds) > 0 {
-		for k := range m.EvictedJobRunIds {
-			v := m.EvictedJobRunIds[k]
-			baseI := i
-			i--
-			if v {
-				dAtA[i] = 1
-			} else {
-				dAtA[i] = 0
-			}
-			i--
-			dAtA[i] = 0x10
-			i -= len(k)
-			copy(dAtA[i:], k)
-			i = encodeVarintSchedulerobjects(dAtA, i, uint64(len(k)))
-			i--
-			dAtA[i] = 0xa
-			i = encodeVarintSchedulerobjects(dAtA, i, uint64(baseI-i))
-			i--
-			dAtA[i] = 0x72
-		}
-	}
 	if len(m.NonArmadaAllocatedResources) > 0 {
 		for k := range m.NonArmadaAllocatedResources {
 			v := m.NonArmadaAllocatedResources[k]
@@ -1337,54 +1279,6 @@ func (m *Node) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		i--
 		dAtA[i] = 0x62
 	}
-	if len(m.AllocatedByQueue) > 0 {
-		for k := range m.AllocatedByQueue {
-			v := m.AllocatedByQueue[k]
-			baseI := i
-			{
-				size, err := (&v).MarshalToSizedBuffer(dAtA[:i])
-				if err != nil {
-					return 0, err
-				}
-				i -= size
-				i = encodeVarintSchedulerobjects(dAtA, i, uint64(size))
-			}
-			i--
-			dAtA[i] = 0x12
-			i -= len(k)
-			copy(dAtA[i:], k)
-			i = encodeVarintSchedulerobjects(dAtA, i, uint64(len(k)))
-			i--
-			dAtA[i] = 0xa
-			i = encodeVarintSchedulerobjects(dAtA, i, uint64(baseI-i))
-			i--
-			dAtA[i] = 0x5a
-		}
-	}
-	if len(m.AllocatedByJobId) > 0 {
-		for k := range m.AllocatedByJobId {
-			v := m.AllocatedByJobId[k]
-			baseI := i
-			{
-				size, err := (&v).MarshalToSizedBuffer(dAtA[:i])
-				if err != nil {
-					return 0, err
-				}
-				i -= size
-				i = encodeVarintSchedulerobjects(dAtA, i, uint64(size))
-			}
-			i--
-			dAtA[i] = 0x12
-			i -= len(k)
-			copy(dAtA[i:], k)
-			i = encodeVarintSchedulerobjects(dAtA, i, uint64(len(k)))
-			i--
-			dAtA[i] = 0xa
-			i = encodeVarintSchedulerobjects(dAtA, i, uint64(baseI-i))
-			i--
-			dAtA[i] = 0x52
-		}
-	}
 	if len(m.StateByJobRunId) > 0 {
 		for k := range m.StateByJobRunId {
 			v := m.StateByJobRunId[k]
@@ -1479,12 +1373,12 @@ func (m *Node) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		i--
 		dAtA[i] = 0x1a
 	}
-	n9, err9 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.LastSeen, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.LastSeen):])
-	if err9 != nil {
-		return 0, err9
+	n7, err7 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.LastSeen, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.LastSeen):])
+	if err7 != nil {
+		return 0, err7
 	}
-	i -= n9
-	i = encodeVarintSchedulerobjects(dAtA, i, uint64(n9))
+	i -= n7
+	i = encodeVarintSchedulerobjects(dAtA, i, uint64(n7))
 	i--
 	dAtA[i] = 0x12
 	if len(m.Id) > 0 {
@@ -1657,12 +1551,12 @@ func (m *QueueClusterResourceUsage) MarshalToSizedBuffer(dAtA []byte) (int, erro
 		i--
 		dAtA[i] = 0x12
 	}
-	n12, err12 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Created, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Created):])
-	if err12 != nil {
-		return 0, err12
+	n10, err10 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Created, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Created):])
+	if err10 != nil {
+		return 0, err10
 	}
-	i -= n12
-	i = encodeVarintSchedulerobjects(dAtA, i, uint64(n12))
+	i -= n10
+	i = encodeVarintSchedulerobjects(dAtA, i, uint64(n10))
 	i--
 	dAtA[i] = 0xa
 	return len(dAtA) - i, nil
@@ -1714,12 +1608,12 @@ func (m *ClusterResourceUsageReport) MarshalToSizedBuffer(dAtA []byte) (int, err
 			dAtA[i] = 0x1a
 		}
 	}
-	n14, err14 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Created, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Created):])
-	if err14 != nil {
-		return 0, err14
+	n12, err12 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Created, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Created):])
+	if err12 != nil {
+		return 0, err12
 	}
-	i -= n14
-	i = encodeVarintSchedulerobjects(dAtA, i, uint64(n14))
+	i -= n12
+	i = encodeVarintSchedulerobjects(dAtA, i, uint64(n12))
 	i--
 	dAtA[i] = 0x12
 	if len(m.Pool) > 0 {
@@ -1809,12 +1703,12 @@ func (m *JobSchedulingInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		i--
 		dAtA[i] = 0x40
 	}
-	n16, err16 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.SubmitTime, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.SubmitTime):])
-	if err16 != nil {
-		return 0, err16
+	n14, err14 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.SubmitTime, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.SubmitTime):])
+	if err14 != nil {
+		return 0, err14
 	}
-	i -= n16
-	i = encodeVarintSchedulerobjects(dAtA, i, uint64(n16))
+	i -= n14
+	i = encodeVarintSchedulerobjects(dAtA, i, uint64(n14))
 	i--
 	dAtA[i] = 0x3a
 	if len(m.PriorityClassName) > 0 {
@@ -2173,24 +2067,6 @@ func (m *Node) Size() (n int) {
 			n += mapEntrySize + 1 + sovSchedulerobjects(uint64(mapEntrySize))
 		}
 	}
-	if len(m.AllocatedByJobId) > 0 {
-		for k, v := range m.AllocatedByJobId {
-			_ = k
-			_ = v
-			l = v.Size()
-			mapEntrySize := 1 + len(k) + sovSchedulerobjects(uint64(len(k))) + 1 + l + sovSchedulerobjects(uint64(l))
-			n += mapEntrySize + 1 + sovSchedulerobjects(uint64(mapEntrySize))
-		}
-	}
-	if len(m.AllocatedByQueue) > 0 {
-		for k, v := range m.AllocatedByQueue {
-			_ = k
-			_ = v
-			l = v.Size()
-			mapEntrySize := 1 + len(k) + sovSchedulerobjects(uint64(len(k))) + 1 + l + sovSchedulerobjects(uint64(l))
-			n += mapEntrySize + 1 + sovSchedulerobjects(uint64(mapEntrySize))
-		}
-	}
 	l = len(m.Name)
 	if l > 0 {
 		n += 1 + l + sovSchedulerobjects(uint64(l))
@@ -2204,14 +2080,6 @@ func (m *Node) Size() (n int) {
 			n += mapEntrySize + 1 + sovSchedulerobjects(uint64(mapEntrySize))
 		}
 	}
-	if len(m.EvictedJobRunIds) > 0 {
-		for k, v := range m.EvictedJobRunIds {
-			_ = k
-			_ = v
-			mapEntrySize := 1 + len(k) + sovSchedulerobjects(uint64(len(k))) + 1 + 1
-			n += mapEntrySize + 1 + sovSchedulerobjects(uint64(mapEntrySize))
-		}
-	}
 	if m.Unschedulable {
 		n += 2
 	}
@@ -3259,264 +3127,6 @@ func (m *Node) Unmarshal(dAtA []byte) error {
 			}
 			m.StateByJobRunId[mapkey] = mapvalue
 			iNdEx = postIndex
-		case 10:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field AllocatedByJobId", wireType)
-			}
-			var msglen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowSchedulerobjects
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				msglen |= int(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if msglen < 0 {
-				return ErrInvalidLengthSchedulerobjects
-			}
-			postIndex := iNdEx + msglen
-			if postIndex < 0 {
-				return ErrInvalidLengthSchedulerobjects
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			if m.AllocatedByJobId == nil {
-				m.AllocatedByJobId = make(map[string]ResourceList)
-			}
-			var mapkey string
-			mapvalue := &ResourceList{}
-			for iNdEx < postIndex {
-				entryPreIndex := iNdEx
-				var wire uint64
-				for shift := uint(0); ; shift += 7 {
-					if shift >= 64 {
-						return ErrIntOverflowSchedulerobjects
-					}
-					if iNdEx >= l {
-						return io.ErrUnexpectedEOF
-					}
-					b := dAtA[iNdEx]
-					iNdEx++
-					wire |= uint64(b&0x7F) << shift
-					if b < 0x80 {
-						break
-					}
-				}
-				fieldNum := int32(wire >> 3)
-				if fieldNum == 1 {
-					var stringLenmapkey uint64
-					for shift := uint(0); ; shift += 7 {
-						if shift >= 64 {
-							return ErrIntOverflowSchedulerobjects
-						}
-						if iNdEx >= l {
-							return io.ErrUnexpectedEOF
-						}
-						b := dAtA[iNdEx]
-						iNdEx++
-						stringLenmapkey |= uint64(b&0x7F) << shift
-						if b < 0x80 {
-							break
-						}
-					}
-					intStringLenmapkey := int(stringLenmapkey)
-					if intStringLenmapkey < 0 {
-						return ErrInvalidLengthSchedulerobjects
-					}
-					postStringIndexmapkey := iNdEx + intStringLenmapkey
-					if postStringIndexmapkey < 0 {
-						return ErrInvalidLengthSchedulerobjects
-					}
-					if postStringIndexmapkey > l {
-						return io.ErrUnexpectedEOF
-					}
-					mapkey = string(dAtA[iNdEx:postStringIndexmapkey])
-					iNdEx = postStringIndexmapkey
-				} else if fieldNum == 2 {
-					var mapmsglen int
-					for shift := uint(0); ; shift += 7 {
-						if shift >= 64 {
-							return ErrIntOverflowSchedulerobjects
-						}
-						if iNdEx >= l {
-							return io.ErrUnexpectedEOF
-						}
-						b := dAtA[iNdEx]
-						iNdEx++
-						mapmsglen |= int(b&0x7F) << shift
-						if b < 0x80 {
-							break
-						}
-					}
-					if mapmsglen < 0 {
-						return ErrInvalidLengthSchedulerobjects
-					}
-					postmsgIndex := iNdEx + mapmsglen
-					if postmsgIndex < 0 {
-						return ErrInvalidLengthSchedulerobjects
-					}
-					if postmsgIndex > l {
-						return io.ErrUnexpectedEOF
-					}
-					mapvalue = &ResourceList{}
-					if err := mapvalue.Unmarshal(dAtA[iNdEx:postmsgIndex]); err != nil {
-						return err
-					}
-					iNdEx = postmsgIndex
-				} else {
-					iNdEx = entryPreIndex
-					skippy, err := skipSchedulerobjects(dAtA[iNdEx:])
-					if err != nil {
-						return err
-					}
-					if (skippy < 0) || (iNdEx+skippy) < 0 {
-						return ErrInvalidLengthSchedulerobjects
-					}
-					if (iNdEx + skippy) > postIndex {
-						return io.ErrUnexpectedEOF
-					}
-					iNdEx += skippy
-				}
-			}
-			m.AllocatedByJobId[mapkey] = *mapvalue
-			iNdEx = postIndex
-		case 11:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field AllocatedByQueue", wireType)
-			}
-			var msglen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowSchedulerobjects
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				msglen |= int(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if msglen < 0 {
-				return ErrInvalidLengthSchedulerobjects
-			}
-			postIndex := iNdEx + msglen
-			if postIndex < 0 {
-				return ErrInvalidLengthSchedulerobjects
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			if m.AllocatedByQueue == nil {
-				m.AllocatedByQueue = make(map[string]ResourceList)
-			}
-			var mapkey string
-			mapvalue := &ResourceList{}
-			for iNdEx < postIndex {
-				entryPreIndex := iNdEx
-				var wire uint64
-				for shift := uint(0); ; shift += 7 {
-					if shift >= 64 {
-						return ErrIntOverflowSchedulerobjects
-					}
-					if iNdEx >= l {
-						return io.ErrUnexpectedEOF
-					}
-					b := dAtA[iNdEx]
-					iNdEx++
-					wire |= uint64(b&0x7F) << shift
-					if b < 0x80 {
-						break
-					}
-				}
-				fieldNum := int32(wire >> 3)
-				if fieldNum == 1 {
-					var stringLenmapkey uint64
-					for shift := uint(0); ; shift += 7 {
-						if shift >= 64 {
-							return ErrIntOverflowSchedulerobjects
-						}
-						if iNdEx >= l {
-							return io.ErrUnexpectedEOF
-						}
-						b := dAtA[iNdEx]
-						iNdEx++
-						stringLenmapkey |= uint64(b&0x7F) << shift
-						if b < 0x80 {
-							break
-						}
-					}
-					intStringLenmapkey := int(stringLenmapkey)
-					if intStringLenmapkey < 0 {
-						return ErrInvalidLengthSchedulerobjects
-					}
-					postStringIndexmapkey := iNdEx + intStringLenmapkey
-					if postStringIndexmapkey < 0 {
-						return ErrInvalidLengthSchedulerobjects
-					}
-					if postStringIndexmapkey > l {
-						return io.ErrUnexpectedEOF
-					}
-					mapkey = string(dAtA[iNdEx:postStringIndexmapkey])
-					iNdEx = postStringIndexmapkey
-				} else if fieldNum == 2 {
-					var mapmsglen int
-					for shift := uint(0); ; shift += 7 {
-						if shift >= 64 {
-							return ErrIntOverflowSchedulerobjects
-						}
-						if iNdEx >= l {
-							return io.ErrUnexpectedEOF
-						}
-						b := dAtA[iNdEx]
-						iNdEx++
-						mapmsglen |= int(b&0x7F) << shift
-						if b < 0x80 {
-							break
-						}
-					}
-					if mapmsglen < 0 {
-						return ErrInvalidLengthSchedulerobjects
-					}
-					postmsgIndex := iNdEx + mapmsglen
-					if postmsgIndex < 0 {
-						return ErrInvalidLengthSchedulerobjects
-					}
-					if postmsgIndex > l {
-						return io.ErrUnexpectedEOF
-					}
-					mapvalue = &ResourceList{}
-					if err := mapvalue.Unmarshal(dAtA[iNdEx:postmsgIndex]); err != nil {
-						return err
-					}
-					iNdEx = postmsgIndex
-				} else {
-					iNdEx = entryPreIndex
-					skippy, err := skipSchedulerobjects(dAtA[iNdEx:])
-					if err != nil {
-						return err
-					}
-					if (skippy < 0) || (iNdEx+skippy) < 0 {
-						return ErrInvalidLengthSchedulerobjects
-					}
-					if (iNdEx + skippy) > postIndex {
-						return io.ErrUnexpectedEOF
-					}
-					iNdEx += skippy
-				}
-			}
-			m.AllocatedByQueue[mapkey] = *mapvalue
-			iNdEx = postIndex
 		case 12:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType)
@@ -3664,121 +3274,6 @@ func (m *Node) Unmarshal(dAtA []byte) error {
 			}
 			m.NonArmadaAllocatedResources[mapkey] = *mapvalue
 			iNdEx = postIndex
-		case 14:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field EvictedJobRunIds", wireType)
-			}
-			var msglen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowSchedulerobjects
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				msglen |= int(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if msglen < 0 {
-				return ErrInvalidLengthSchedulerobjects
-			}
-			postIndex := iNdEx + msglen
-			if postIndex < 0 {
-				return ErrInvalidLengthSchedulerobjects
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			if m.EvictedJobRunIds == nil {
-				m.EvictedJobRunIds = make(map[string]bool)
-			}
-			var mapkey string
-			var mapvalue bool
-			for iNdEx < postIndex {
-				entryPreIndex := iNdEx
-				var wire uint64
-				for shift := uint(0); ; shift += 7 {
-					if shift >= 64 {
-						return ErrIntOverflowSchedulerobjects
-					}
-					if iNdEx >= l {
-						return io.ErrUnexpectedEOF
-					}
-					b := dAtA[iNdEx]
-					iNdEx++
-					wire |= uint64(b&0x7F) << shift
-					if b < 0x80 {
-						break
-					}
-				}
-				fieldNum := int32(wire >> 3)
-				if fieldNum == 1 {
-					var stringLenmapkey uint64
-					for shift := uint(0); ; shift += 7 {
-						if shift >= 64 {
-							return ErrIntOverflowSchedulerobjects
-						}
-						if iNdEx >= l {
-							return io.ErrUnexpectedEOF
-						}
-						b := dAtA[iNdEx]
-						iNdEx++
-						stringLenmapkey |= uint64(b&0x7F) << shift
-						if b < 0x80 {
-							break
-						}
-					}
-					intStringLenmapkey := int(stringLenmapkey)
-					if intStringLenmapkey < 0 {
-						return ErrInvalidLengthSchedulerobjects
-					}
-					postStringIndexmapkey := iNdEx + intStringLenmapkey
-					if postStringIndexmapkey < 0 {
-						return ErrInvalidLengthSchedulerobjects
-					}
-					if postStringIndexmapkey > l {
-						return io.ErrUnexpectedEOF
-					}
-					mapkey = string(dAtA[iNdEx:postStringIndexmapkey])
-					iNdEx = postStringIndexmapkey
-				} else if fieldNum == 2 {
-					var mapvaluetemp int
-					for shift := uint(0); ; shift += 7 {
-						if shift >= 64 {
-							return ErrIntOverflowSchedulerobjects
-						}
-						if iNdEx >= l {
-							return io.ErrUnexpectedEOF
-						}
-						b := dAtA[iNdEx]
-						iNdEx++
-						mapvaluetemp |= int(b&0x7F) << shift
-						if b < 0x80 {
-							break
-						}
-					}
-					mapvalue = bool(mapvaluetemp != 0)
-				} else {
-					iNdEx = entryPreIndex
-					skippy, err := skipSchedulerobjects(dAtA[iNdEx:])
-					if err != nil {
-						return err
-					}
-					if (skippy < 0) || (iNdEx+skippy) < 0 {
-						return ErrInvalidLengthSchedulerobjects
-					}
-					if (iNdEx + skippy) > postIndex {
-						return io.ErrUnexpectedEOF
-					}
-					iNdEx += skippy
-				}
-			}
-			m.EvictedJobRunIds[mapkey] = mapvalue
-			iNdEx = postIndex
 		case 15:
 			if wireType != 0 {
 				return fmt.Errorf("proto: wrong wireType = %d for field Unschedulable", wireType)
diff --git a/internal/scheduler/schedulerobjects/schedulerobjects.proto b/internal/scheduler/schedulerobjects/schedulerobjects.proto
index 0261a4b8836..61f4b05b201 100644
--- a/internal/scheduler/schedulerobjects/schedulerobjects.proto
+++ b/internal/scheduler/schedulerobjects/schedulerobjects.proto
@@ -48,12 +48,6 @@ message Node {
     map<int32, ResourceList> allocatable_by_priority_and_resource = 8 [(gogoproto.nullable) = false];
     // Ids of the job runs currently assigned to this node and their current state.
     map<string, JobRunState> state_by_job_run_id = 9 [(gogoproto.nullable) = false];
-    // Resource allocated to jobs on this node.
-    map<string, ResourceList> allocated_by_job_id = 10 [(gogoproto.nullable) = false];
-    // Resource allocated to queues on this node.
-    map<string, ResourceList> allocated_by_queue = 11 [(gogoproto.nullable) = false];
-    // Ids of all runs evicted on this node.
-    map<string, bool> evicted_job_run_ids = 14 [(gogoproto.nullable) = false];
     // Resource allocated to non-Armada pods on this node.
     map<int32, ResourceList> non_armada_allocated_resources = 13 [(gogoproto.nullable) = false];
     // If true, no new jobs should be scheduled onto this node, e.g., because the node has been cordoned.