diff --git a/src/script_opt/ZAM/OPs/unary-exprs.op b/src/script_opt/ZAM/OPs/unary-exprs.op
index a44cbe937d..09d8f9d736 100644
--- a/src/script_opt/ZAM/OPs/unary-exprs.op
+++ b/src/script_opt/ZAM/OPs/unary-exprs.op
@@ -164,14 +164,6 @@ macro EvalCast(lhs, rhs)
 	else
 		ERROR(error.c_str());
 
-# Cast an "any" type to the given type.  Only needed for type-based switch
-# statements.
-internal-op Cast-Any
-class VV
-op-types X a
-eval	ValPtr rhs = {NewRef{}, $1};
-	EvalCast($$, rhs)
-
 direct-unary-op Is Is
 
 internal-op Is
diff --git a/testing/btest/Baseline.zam/opt.validate-ZAM/output b/testing/btest/Baseline.zam/opt.validate-ZAM/output
index b3ebf021ca..d0eed386e4 100644
--- a/testing/btest/Baseline.zam/opt.validate-ZAM/output
+++ b/testing/btest/Baseline.zam/opt.validate-ZAM/output
@@ -1,2 +1,2 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-1237 valid, 1860 tested, 426 skipped
+1236 valid, 1859 tested, 425 skipped