diff --git a/src/main/java/org/rumbledb/cli/Main.java b/src/main/java/org/rumbledb/cli/Main.java
index 98504198d3..db73e690b2 100644
--- a/src/main/java/org/rumbledb/cli/Main.java
+++ b/src/main/java/org/rumbledb/cli/Main.java
@@ -36,19 +36,6 @@ public class Main {
     public static RumbleJLineShell terminal = null;
 
     public static void main(String[] args) throws IOException {
-        String javaVersion = System.getProperty("java.version");
-        if (
-            !javaVersion.startsWith("17")
-                && !javaVersion.startsWith("21")
-        ) {
-            System.err.println("[Error] RumbleDB requires Java 17 or 21 (17 being the default Spark 4 version).");
-            System.err.println("Your Java version: " + System.getProperty("java.version"));
-            System.err.println("You can download Java 17 or 21 from https://adoptium.net/");
-            System.err.println(
-                "If you do have Java 17 or 21, but the wrong version appears above, then it means you need to set your JAVA_HOME environment variable properly to point to Java 17 or 21."
-            );
-            System.exit(43);
-        }
         RumbleRuntimeConfiguration sparksoniqConf = null;
         // Parse arguments
         try {
diff --git a/src/main/resources/assets/defaultscreen.txt b/src/main/resources/assets/defaultscreen.txt
index 23489d6e71..c4dffafe21 100644
--- a/src/main/resources/assets/defaultscreen.txt
+++ b/src/main/resources/assets/defaultscreen.txt
@@ -9,7 +9,7 @@ If you do not want to install Spark, then you need to use the standalone jar
 instead from www.rumbledb.org.
 
 Usage:
-spark-submit <Spark arguments> <path to RumbleDB's jar> <mode> <parameters>
+rumbledb <mode> <parameters>
 
 The examples below assume the jar name is rumbledb.jar. You need to use
 the actual name of the jar file you downloaded.
@@ -21,16 +21,16 @@ for directly running a query from an input file or (with -q) provided directly o
 
 It is the default mode.
 
-spark-submit rumbledb.jar run my-query.jq
-spark-submit rumbledb.jar run -q '1+1'
+rumbledb run my-query.jq
+rumbledb run -q '1+1'
 
 You can specify an output path with -o like so:
-spark-submit rumbledb.jar run -q '1+1' -o my-output.txt
+rumbledb run -q '1+1' -o my-output.txt
 
 **** serve ****
 for running as an HTTP server listening on the specified port (-p) and host (-h).
 
-spark-submit rumbledb.jar serve -p 9090
+rumbledb serve -p 9090
 
 RumbleDB also supports Apache Livy for use in Jupyter notebooks, which may be
 even more convenient if you are using a cluster.
@@ -38,29 +38,12 @@ even more convenient if you are using a cluster.
 **** repl ****
 for shell mode.
 
-spark-submit rumbledb.jar repl
+rumbledb repl
 
 
 **** resource use configuration ****
 
-For a local use, you can control the number of cores, as well as allocated
-memory, with:
-spark-submit --master local[*] rumbledb.jar repl
-spark-submit --master local[*] rumbledb.jar repl
-spark-submit --master local[2] rumbledb.jar repl
-spark-submit --master local[*] --driver-memory 10G rumbledb.jar repl
-
-You can use RumbleDB remotely with:
-spark-submit --master yarn rumbledb.jar repl
-
-(Although for clusters provided as a service, --master yarn is often implicit
-and unnecessary).
-
-For remote use (e.g., logged in on the Spark cluster with ssh), you can set the
-number of executors, cores and memory, you can use:
-spark-submit --executor-cores 3 --executor-memory 5G rumbledb.jar repl
-
-For remote use, you can also use other file system paths such as S3, HDFS, etc:
-spark-submit rumbledb.jar run hdfs://server:port/my-query.jq -o hdfs://server:port/my-output.json
+The homebrew edition of RumbleDB cannot change the number of cores or the memory allocation.
+If you wish to do so, you could consider using the standalone RumbleDB jar.
 
 More documentation on available CLI parameters is available on https://www.rumbledb.org/