diff --git a/src/Type.cc b/src/Type.cc
index 322413ee6a..34b78e820e 100644
--- a/src/Type.cc
+++ b/src/Type.cc
@@ -34,7 +34,6 @@ const char* type_name(TypeTag t)
 		"bool",      // 1
 		"int",       // 2
 		"count",     // 3
-		"counter",   // 4
 		"double",    // 5
 		"time",      // 6
 		"interval",  // 7
diff --git a/src/Type.h b/src/Type.h
index 79d9ddb9f2..40ba387620 100644
--- a/src/Type.h
+++ b/src/Type.h
@@ -38,7 +38,6 @@ enum TypeTag {
 	TYPE_BOOL,      // 1
 	TYPE_INT,       // 2
 	TYPE_COUNT,     // 3
-	TYPE_COUNTER [[deprecated("Remove in v4.1. TYPE_COUNTER was removed; use TYPE_COUNT instead.")]], // 4
 	TYPE_DOUBLE,    // 5
 	TYPE_TIME,      // 6
 	TYPE_INTERVAL,  // 7
diff --git a/testing/btest/Baseline/scripts.base.frameworks.cluster.custom_pool_limits/manager-1..stdout b/testing/btest/Baseline/scripts.base.frameworks.cluster.custom_pool_limits/manager-1..stdout
index 8ead7cccb9..a07dae7748 100644
--- a/testing/btest/Baseline/scripts.base.frameworks.cluster.custom_pool_limits/manager-1..stdout
+++ b/testing/btest/Baseline/scripts.base.frameworks.cluster.custom_pool_limits/manager-1..stdout
@@ -1,19 +1,19 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 1st stuff
 hrw, 0, zeek/cluster/node/proxy-1/
-hrw (custom pool), 0, zeek/cluster/node/proxy-1/
+hrw (custom pool), 0, zeek/cluster/node/proxy-2/
 hrw, 1, zeek/cluster/node/proxy-1/
-hrw (custom pool), 1, zeek/cluster/node/proxy-1/
+hrw (custom pool), 1, zeek/cluster/node/proxy-2/
 hrw, 2, zeek/cluster/node/proxy-1/
 hrw (custom pool), 2, zeek/cluster/node/proxy-1/
 hrw, 3, zeek/cluster/node/proxy-1/
-hrw (custom pool), 3, zeek/cluster/node/proxy-1/
+hrw (custom pool), 3, zeek/cluster/node/proxy-2/
 hrw, 13, zeek/cluster/node/proxy-1/
 hrw (custom pool), 13, zeek/cluster/node/proxy-2/
 hrw, 37, zeek/cluster/node/proxy-1/
 hrw (custom pool), 37, zeek/cluster/node/proxy-2/
 hrw, 42, zeek/cluster/node/proxy-1/
-hrw (custom pool), 42, zeek/cluster/node/proxy-2/
+hrw (custom pool), 42, zeek/cluster/node/proxy-1/
 hrw, 101, zeek/cluster/node/proxy-1/
 hrw (custom pool), 101, zeek/cluster/node/proxy-2/
 rr, zeek/cluster/node/proxy-1/
@@ -33,19 +33,19 @@ rr (custom pool), zeek/cluster/node/proxy-1/
 rr, zeek/cluster/node/proxy-1/
 rr (custom pool), zeek/cluster/node/proxy-2/
 hrw, 0, zeek/cluster/node/proxy-1/
-hrw (custom pool), 0, zeek/cluster/node/proxy-1/
+hrw (custom pool), 0, zeek/cluster/node/proxy-2/
 hrw, 1, zeek/cluster/node/proxy-1/
-hrw (custom pool), 1, zeek/cluster/node/proxy-1/
+hrw (custom pool), 1, zeek/cluster/node/proxy-2/
 hrw, 2, zeek/cluster/node/proxy-1/
 hrw (custom pool), 2, zeek/cluster/node/proxy-1/
 hrw, 3, zeek/cluster/node/proxy-1/
-hrw (custom pool), 3, zeek/cluster/node/proxy-1/
+hrw (custom pool), 3, zeek/cluster/node/proxy-2/
 hrw, 13, zeek/cluster/node/proxy-1/
 hrw (custom pool), 13, zeek/cluster/node/proxy-2/
 hrw, 37, zeek/cluster/node/proxy-1/
 hrw (custom pool), 37, zeek/cluster/node/proxy-2/
 hrw, 42, zeek/cluster/node/proxy-1/
-hrw (custom pool), 42, zeek/cluster/node/proxy-2/
+hrw (custom pool), 42, zeek/cluster/node/proxy-1/
 hrw, 101, zeek/cluster/node/proxy-1/
 hrw (custom pool), 101, zeek/cluster/node/proxy-2/
 2nd stuff
diff --git a/testing/btest/Baseline/scripts.base.frameworks.cluster.topic_distribution/manager-1..stdout b/testing/btest/Baseline/scripts.base.frameworks.cluster.topic_distribution/manager-1..stdout
index 29557e06da..46f0ead64c 100644
--- a/testing/btest/Baseline/scripts.base.frameworks.cluster.topic_distribution/manager-1..stdout
+++ b/testing/btest/Baseline/scripts.base.frameworks.cluster.topic_distribution/manager-1..stdout
@@ -1,12 +1,12 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 1st stuff
-hrw, 0, zeek/cluster/node/proxy-1/
-hrw, 1, zeek/cluster/node/proxy-1/
+hrw, 0, zeek/cluster/node/proxy-2/
+hrw, 1, zeek/cluster/node/proxy-2/
 hrw, 2, zeek/cluster/node/proxy-1/
-hrw, 3, zeek/cluster/node/proxy-1/
+hrw, 3, zeek/cluster/node/proxy-2/
 hrw, 13, zeek/cluster/node/proxy-2/
 hrw, 37, zeek/cluster/node/proxy-2/
-hrw, 42, zeek/cluster/node/proxy-2/
+hrw, 42, zeek/cluster/node/proxy-1/
 hrw, 101, zeek/cluster/node/proxy-2/
 rr, zeek/cluster/node/proxy-1/
 rr, zeek/cluster/node/proxy-2/
@@ -16,13 +16,13 @@ rr, zeek/cluster/node/proxy-1/
 rr, zeek/cluster/node/proxy-2/
 rr, zeek/cluster/node/proxy-1/
 rr, zeek/cluster/node/proxy-2/
-hrw, 0, zeek/cluster/node/proxy-1/
-hrw, 1, zeek/cluster/node/proxy-1/
+hrw, 0, zeek/cluster/node/proxy-2/
+hrw, 1, zeek/cluster/node/proxy-2/
 hrw, 2, zeek/cluster/node/proxy-1/
-hrw, 3, zeek/cluster/node/proxy-1/
+hrw, 3, zeek/cluster/node/proxy-2/
 hrw, 13, zeek/cluster/node/proxy-2/
 hrw, 37, zeek/cluster/node/proxy-2/
-hrw, 42, zeek/cluster/node/proxy-2/
+hrw, 42, zeek/cluster/node/proxy-1/
 hrw, 101, zeek/cluster/node/proxy-2/
 2nd stuff
 hrw, 0, zeek/cluster/node/proxy-2/
diff --git a/testing/btest/Baseline/scripts.base.frameworks.cluster.topic_distribution_bifs/proxy-1..stdout b/testing/btest/Baseline/scripts.base.frameworks.cluster.topic_distribution_bifs/proxy-1..stdout
index 3de67f73ed..a89373f442 100644
--- a/testing/btest/Baseline/scripts.base.frameworks.cluster.topic_distribution_bifs/proxy-1..stdout
+++ b/testing/btest/Baseline/scripts.base.frameworks.cluster.topic_distribution_bifs/proxy-1..stdout
@@ -1,8 +1,6 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-got distributed event hrw, 0
-got distributed event hrw, 1
 got distributed event hrw, 2
-got distributed event hrw, 3
+got distributed event hrw, 42
 got distributed event rr, 0
 got distributed event rr, 2
 got distributed event rr, 13
diff --git a/testing/btest/Baseline/scripts.base.frameworks.cluster.topic_distribution_bifs/proxy-2..stdout b/testing/btest/Baseline/scripts.base.frameworks.cluster.topic_distribution_bifs/proxy-2..stdout
index d9890376c2..e6e28472a9 100644
--- a/testing/btest/Baseline/scripts.base.frameworks.cluster.topic_distribution_bifs/proxy-2..stdout
+++ b/testing/btest/Baseline/scripts.base.frameworks.cluster.topic_distribution_bifs/proxy-2..stdout
@@ -1,7 +1,9 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+got distributed event hrw, 0
+got distributed event hrw, 1
+got distributed event hrw, 3
 got distributed event hrw, 13
 got distributed event hrw, 37
-got distributed event hrw, 42
 got distributed event hrw, 101
 got distributed event rr, 1
 got distributed event rr, 3
diff --git a/testing/btest/Baseline/scripts.base.utils.hash_hrw/output b/testing/btest/Baseline/scripts.base.utils.hash_hrw/output
index fe17378e5a..da11e37b36 100644
--- a/testing/btest/Baseline/scripts.base.utils.hash_hrw/output
+++ b/testing/btest/Baseline/scripts.base.utils.hash_hrw/output
@@ -9,18 +9,18 @@ T
 F
 [id=0, user_data=alice]
 [id=3, user_data=dave]
-[id=3, user_data=dave]
-[id=0, user_data=alice]
-[id=0, user_data=alice]
+[id=4, user_data=eve]
+[id=4, user_data=eve]
 [id=4, user_data=eve]
 [id=0, user_data=alice]
+[id=3, user_data=dave]
 [id=1, user_data=bob]
 [id=0, user_data=alice]
 [id=1, user_data=bob]
 T
+[id=4, user_data=eve]
 [id=3, user_data=dave]
-[id=3, user_data=dave]
-[id=3, user_data=dave]
+[id=4, user_data=eve]
 [id=4, user_data=eve]
 [id=4, user_data=eve]
 [id=4, user_data=eve]
@@ -31,11 +31,11 @@ T
 T
 [id=0, user_data=alice]
 [id=3, user_data=dave]
-[id=3, user_data=dave]
-[id=0, user_data=alice]
-[id=0, user_data=alice]
+[id=4, user_data=eve]
+[id=4, user_data=eve]
 [id=4, user_data=eve]
 [id=0, user_data=alice]
+[id=3, user_data=dave]
 [id=1, user_data=bob]
 [id=0, user_data=alice]
 [id=1, user_data=bob]