diff --git a/start-32bit.sh b/start-32bit.sh
index 76341d7..ab45a1d 100644
--- a/start-32bit.sh
+++ b/start-32bit.sh
@@ -34,21 +34,7 @@ fi
 # Comment out for bigger systems, e.g. non-routers
 # or when API documentation is enabled
 JVM_MEMORY_ARGS="-Xss1256k -Xms1750m -Xmx1750m"
-#JVM_MEMORY_ARGS="
-  -Xms1750m \
-  -Xmx1750m \
-  -Xss1212k \
-  -XX:+HeapDumpOnOutOfMemoryError \
-  -XX:HeapDumpPath=./heapdump.hprof \
-  -XX:+UseG1GC \
-  -XX:MaxGCPauseMillis=300 \
-  -XX:InitiatingHeapOccupancyPercent=50 \
-  -XX:ParallelGCThreads=4 \
-  -XX:ConcGCThreads=2 \
-  -XX:G1HeapRegionSize=32m \
-  -XX:MaxTenuringThreshold=10 \
-  -XX:+AlwaysPreTouch 
-"
+
 
 # Although java.net.preferIPv4Stack is supposed to be false
 # by default in Java 11, on some platforms (e.g. FreeBSD 12),
diff --git a/start-4GB.sh b/start-4GB.sh
index b426992..1eaf7d8 100644
--- a/start-4GB.sh
+++ b/start-4GB.sh
@@ -34,21 +34,6 @@ fi
 # Comment out for bigger systems, e.g. non-routers
 # or when API documentation is enabled
 JVM_MEMORY_ARGS="-XX:MaxRAMPercentage=80 -XX:+UseG1GC -Xss1024k"
-#JVM_MEMORY_ARGS="
-  -Xms2600m \
-  -Xmx2600m \
-  -Xss1024k \
-  -XX:+HeapDumpOnOutOfMemoryError \
-  -XX:HeapDumpPath=./heapdump.hprof \
-  -XX:+UseG1GC \
-  -XX:MaxGCPauseMillis=300 \
-  -XX:InitiatingHeapOccupancyPercent=75 \
-  -XX:ParallelGCThreads=4 \
-  -XX:ConcGCThreads=2 \
-  -XX:G1HeapRegionSize=32m \
-  -XX:MaxTenuringThreshold=10 \
-  -XX:+AlwaysPreTouch 
-"
 
 
 # Although java.net.preferIPv4Stack is supposed to be false
diff --git a/start-6001-to-16000m.sh b/start-6001-to-16000m.sh
index cd6e7d3..a234db2 100644
--- a/start-6001-to-16000m.sh
+++ b/start-6001-to-16000m.sh
@@ -33,7 +33,7 @@ fi
 # Limits Java JVM stack size and maximum heap usage.
 # Comment out for bigger systems, e.g. non-routers
 # or when API documentation is enabled
-JVM_MEMORY_ARGS="-XX:MaxRAMPercentage40 -XX:+UseG1GC -Xss512k"
+JVM_MEMORY_ARGS="-XX:MaxRAMPercentage=50 -XX:+UseG1GC -Xss1024k"
 
 
 # Although java.net.preferIPv4Stack is supposed to be false