diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index b52a32fd9..cdc4f2b63 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,7 +1,7 @@
 # Forward
 
 This document reflects a commitment to maintain respect and civility
-within the ebdse project. It is the maintainers' wish that a code of
+within the NoSQLBench project. It is the maintainers' wish that a code of
 conduct is not needed, as all contributors should be excellent to
 each other by default. However, even in such case, it is important to
 set expectations for other contributors who are looking for projects to
diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/EBCLIScriptAssembly.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/EBCLIScriptAssembly.java
index 2a6051bee..a8684b8a6 100644
--- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/EBCLIScriptAssembly.java
+++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/EBCLIScriptAssembly.java
@@ -39,14 +39,12 @@ public class EBCLIScriptAssembly {
                         sb.append("\n");
                     }
                     break;
-                case start2:
-                case run2:
                 case start: // start activity
                 case run: // run activity
                     // Sanity check that this can parse before using it
                     activityDef = ActivityDef.parseActivityDef(cmdSpec);
                     sb.append("// from CLI as ").append(cmd).append("\n")
-                            .append("scenario.").append(cmdType.toString().replace("2","")).append("(\"")
+                            .append("scenario.").append(cmdType.toString()).append("(\"")
                             .append(cmdSpec)
                             .append("\");\n");
                     sb.append("// from CLI as ").append(cmd).append("\n");
@@ -54,13 +52,6 @@ public class EBCLIScriptAssembly {
                     if (!cmdSpec.endsWith("\n")) {
                         sb.append("\n");
                     }
-                    if (!cmdType.toString().contains("2")) {
-                        sb.append("// temporary work-around for issue until proper fix\n");
-                        sb.append("for each (paramset in activities.keySet()) {\n");
-                        sb.append(" paramset.noop='value';\n");
-                        sb.append("}\n");
-                    }
-
                     break;
                 case await: // await activity
                     sb.append("// from CLI as ").append(cmd).append("\n");