diff --git a/config/scripts.cfg b/config/scripts.cfg
index 3712971d..26b40d3f 100644
--- a/config/scripts.cfg
+++ b/config/scripts.cfg
@@ -122,7 +122,7 @@ loop d $NUM_WEAPONS [ const (at $WEAPONS $d) $d ]
 
 loop r $NUM_MODES [ const (at $MODES $r) (format [votemap %1 %2 %3] $r "$arg1" "$arg2") ]
 
-const modenum [ f = -1; loop i $NUM_MODES [ if (strcmp (at $MODES $i) $arg1) [ f = $i; break ] ]; result $f ]
+const modenum [ result (findlist $MODES $arg1) ]
 
 // Mode/map-setting aliases.
 const votemap [ mode $arg1; map $arg2 $arg3 ]
diff --git a/demos/tutorial_demo.dmo b/demos/tutorial_demo.dmo
deleted file mode 100644
index edeaeac2..00000000
Binary files a/demos/tutorial_demo.dmo and /dev/null differ