diff --git a/README.md b/README.md
index e7a2351..76be2ad 100755
--- a/README.md
+++ b/README.md
@@ -21,12 +21,12 @@ The zero-dependency distribution sizes are as follows:
 
 OS | Uncompressed size (MB) | xz Compressed size (MB)
 ------------ | ------------- | -------------
-Linux | 49.1 | 30.7
-Mac | 40.0 | 25.3
-Windows | 39.9 | 27.8
-Linux GUI | 73.4 | 49.0
-Mac GUI | 62.2 | 44.1
-Windows GUI | 61.7 | 45.1
+Linux | 48.1 | 28.8
+Mac | 38.0 | 24.5
+Windows | 38.9 | 26.9
+Linux GUI | 72.4 | 48.0
+Mac GUI | 61.1 | 43.1
+Windows GUI | 59.6 | 43.2
 
 ## Building the launchers
 
diff --git a/bin/convert-jars-to-modules.sh b/bin/convert-jars-to-modules.sh
index 424905c..5a154bc 100755
--- a/bin/convert-jars-to-modules.sh
+++ b/bin/convert-jars-to-modules.sh
@@ -28,16 +28,18 @@ mkdir -p "$basedir/target/modules"
 echo "*** Determining dependencies for $combinedJarPath"
 "$JAVA_HOME"/bin/jdeps --add-modules=ALL-MODULE-PATH --generate-module-info "$basedir/target/module-info" "$combinedJarPath"
 
+modulesToRemove="java.desktop java.management java.rmi java.sql java.naming"
+
 if [ $(uname -s) = Darwin ]; then
   sed -i '' -e '$ d' "$basedir/target/module-info/combined/module-info.java"
-  sed -i '' '/java.desktop/d' "$basedir/target/module-info/combined/module-info.java"
-  sed -i '' '/java.management.rmi/d' "$basedir/target/module-info/combined/module-info.java"
-  sed -i '' '/java.rmi/d' "$basedir/target/module-info/combined/module-info.java"
+  for i in $modulesToRemove; do
+    sed -i '' "/$i/d" "$basedir/target/module-info/combined/module-info.java"
+  done
 else
   sed -i '$ d' "$basedir/target/module-info/combined/module-info.java"
-  sed '/java.desktop/d' "$basedir/target/module-info/combined/module-info.java"
-  sed '/java.management.rmi/d' "$basedir/target/module-info/combined/module-info.java"
-  sed '/java.rmi/d' "$basedir/target/module-info/combined/module-info.java"
+  for i in $modulesToRemove; do
+    sed "/$i/d" "$basedir/target/module-info/combined/module-info.java"
+  done
 fi
 echo 'uses org.eclipse.jetty.http.HttpFieldPreEncoder; }' >> "$basedir/target/module-info/combined/module-info.java"