diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
index 82def193e..76092e9aa 100644
--- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
+++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
@@ -425,7 +425,6 @@ public class NBCLI implements Function<String[], Integer> {
             options.getScriptFile(),
             options.getScriptingEngine(),
             options.getProgressSpec(),
-            options.wantsGraaljsCompatMode(),
             options.wantsStackTraces(),
             options.wantsCompileScript(),
             options.getReportSummaryTo(),
diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java
index e1409b994..43d431b93 100644
--- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java
+++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java
@@ -121,8 +121,6 @@ public class NBCLIOptions {
     private static final String DOCKER_PROM_RETENTION_DAYS = "--docker-prom-retention-days";
 
     private static final String GRAALJS_ENGINE = "--graaljs";
-    private static final String NASHORN_ENGINE = "--nashorn";
-    private static final String GRAALJS_COMPAT = "--graaljs-compat";
 
     private static final String DEFAULT_CONSOLE_PATTERN = "TERSE";
     private static final String DEFAULT_LOGFILE_PATTERN = "VERBOSE";
@@ -168,7 +166,6 @@ public class NBCLIOptions {
     private boolean wantsWorkloadsList = false;
     private final List<String> wantsToIncludePaths = new ArrayList<>();
     private Scenario.Engine engine = Scenario.Engine.Graalvm;
-    private boolean graaljs_compat = false;
     private int hdr_digits = 3;
     private String docker_grafana_tag = "7.3.4";
     private String docker_prom_tag = "latest";
@@ -509,17 +506,10 @@ public class NBCLIOptions {
             String word = arglist.peekFirst();
 
             switch (word) {
-                case GRAALJS_COMPAT:
-                    graaljs_compat = true;
-                    arglist.removeFirst();
-                    break;
                 case GRAALJS_ENGINE:
                     engine = Scenario.Engine.Graalvm;
                     arglist.removeFirst();
                     break;
-                case NASHORN_ENGINE:
-                    throw new RuntimeException("The nashorn engine has been deprecated in this major version of " +
-                            "NoSQLBench");
                 case COMPILE_SCRIPT:
                     arglist.removeFirst();
                     compileScript = true;
@@ -686,10 +676,6 @@ public class NBCLIOptions {
         return engine;
     }
 
-    public boolean wantsGraaljsCompatMode() {
-        return graaljs_compat;
-    }
-
     public List<LoggerConfigData> getHistoLoggerConfigs() {
         List<LoggerConfigData> configs =
                 histoLoggerConfigs.stream().map(LoggerConfigData::new).collect(Collectors.toList());
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java b/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java
index be9dda2d5..6f6108428 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java
@@ -83,7 +83,6 @@ public class Scenario implements Callable<ScenarioResult> {
     private ScenarioController scenarioController;
     private ActivityProgressIndicator activityProgressIndicator;
     private String progressInterval = "console:1m";
-    private boolean wantsGraaljsCompatMode;
     private ScenarioContext scriptEnv;
     private final String scenarioName;
     private ScriptParams scenarioScriptParams;
@@ -103,7 +102,6 @@ public class Scenario implements Callable<ScenarioResult> {
         String scriptfile,
         Engine engine,
         String progressInterval,
-        boolean wantsGraaljsCompatMode,
         boolean wantsStackTraces,
         boolean wantsCompiledScript,
         String reportSummaryTo,
@@ -115,7 +113,6 @@ public class Scenario implements Callable<ScenarioResult> {
         this.scriptfile = scriptfile;
         this.engine = engine;
         this.progressInterval = progressInterval;
-        this.wantsGraaljsCompatMode = wantsGraaljsCompatMode;
         this.wantsStackTraces = wantsStackTraces;
         this.wantsCompiledScript = wantsCompiledScript;
         this.reportSummaryTo = reportSummaryTo;
@@ -204,15 +201,13 @@ public class Scenario implements Callable<ScenarioResult> {
 
         scriptEngine.put("params", scenarioScriptParams);
 
-        if (wantsGraaljsCompatMode) {
-            scriptEngine.put("scenario", scenarioController);
-            scriptEngine.put("metrics", new PolyglotMetricRegistryBindings(metricRegistry));
-            scriptEngine.put("activities", new NashornActivityBindings(scenarioController));
-        } else {
+//            scriptEngine.put("scenario", scenarioController);
+//            scriptEngine.put("metrics", new PolyglotMetricRegistryBindings(metricRegistry));
+//            scriptEngine.put("activities", new NashornActivityBindings(scenarioController));
+
             scriptEngine.put("scenario", new PolyglotScenarioController(scenarioController));
             scriptEngine.put("metrics", new PolyglotMetricRegistryBindings(metricRegistry));
             scriptEngine.put("activities", new NashornActivityBindings(scenarioController));
-        }
 
         for (ScriptingPluginInfo<?> extensionDescriptor : SandboxExtensionFinder.findAll()) {
             if (!extensionDescriptor.isAutoLoading()) {
diff --git a/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/ScenarioExecutorEndpoint.java b/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/ScenarioExecutorEndpoint.java
index 86497249a..61cb7a79a 100644
--- a/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/ScenarioExecutorEndpoint.java
+++ b/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/ScenarioExecutorEndpoint.java
@@ -134,8 +134,7 @@ public class ScenarioExecutorEndpoint implements WebServiceObject {
             "",
             Scenario.Engine.Graalvm,
             "disabled",
-            false,
-            true,
+                true,
             false,
             "",
             cmdList.toString(),