diff --git a/apache-jsp/src/main/config/modules/apache-jsp.mod b/apache-jsp/src/main/config/modules/apache-jsp.mod
index 8d5e1b6..5123670 100644
--- a/apache-jsp/src/main/config/modules/apache-jsp.mod
+++ b/apache-jsp/src/main/config/modules/apache-jsp.mod
@@ -2,9 +2,6 @@
 # Apache JSP Module
 #
 
-[version]
-9.3
-
 [name]
 apache-jsp
 
diff --git a/apache-jstl/src/main/config/modules/apache-jstl.mod b/apache-jstl/src/main/config/modules/apache-jstl.mod
index ed7104c..e4a9001 100644
--- a/apache-jstl/src/main/config/modules/apache-jstl.mod
+++ b/apache-jstl/src/main/config/modules/apache-jstl.mod
@@ -2,9 +2,6 @@
 # Apache JSTL 
 #
 
-[version]
-9.3
-
 [name]
 apache-jstl
 
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_40.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_40.mod
index 1e677ee..a1002a4 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_40.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_40.mod
@@ -1,6 +1,3 @@
-[version]
-9.3
-
 [name]
 alpn-boot
 
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_45.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_45.mod
index 1e677ee..a1002a4 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_45.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_45.mod
@@ -1,6 +1,3 @@
-[version]
-9.3
-
 [name]
 alpn-boot
 
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_51.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_51.mod
index 1e677ee..a1002a4 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_51.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_51.mod
@@ -1,6 +1,3 @@
-[version]
-9.3
-
 [name]
 alpn-boot
 
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_55.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_55.mod
index 1e677ee..a1002a4 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_55.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_55.mod
@@ -1,6 +1,3 @@
-[version]
-9.3
-
 [name]
 alpn-boot
 
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_60.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_60.mod
index 1e677ee..a1002a4 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_60.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_60.mod
@@ -1,6 +1,3 @@
-[version]
-9.3
-
 [name]
 alpn-boot
 
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_65.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_65.mod
index 1e677ee..a1002a4 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_65.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_65.mod
@@ -1,6 +1,3 @@
-[version]
-9.3
-
 [name]
 alpn-boot
 
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_67.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_67.mod
index 1e677ee..a1002a4 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_67.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_67.mod
@@ -1,6 +1,3 @@
-[version]
-9.3
-
 [name]
 alpn-boot
 
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_71.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_71.mod
index 796c3cf..a554324 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_71.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_71.mod
@@ -1,6 +1,3 @@
-[version]
-9.3
-
 [name]
 alpn-boot
 
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_72.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_72.mod
index 796c3cf..a554324 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_72.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_72.mod
@@ -1,6 +1,3 @@
-[version]
-9.3
-
 [name]
 alpn-boot
 
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_75.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_75.mod
index 86a2608..3f6f912 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_75.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_75.mod
@@ -1,6 +1,3 @@
-[version]
-9.3
-
 [name]
 alpn-boot
 
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_76.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_76.mod
index 86a2608..3f6f912 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_76.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_76.mod
@@ -1,6 +1,3 @@
-[version]
-9.3
-
 [name]
 alpn-boot
 
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_79.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_79.mod
index 0a96751..ac315d6 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_79.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_79.mod
@@ -1,6 +1,3 @@
-[version]
-9.3
-
 [name]
 protonego-boot
 
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_80.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_80.mod
index 0a96751..ac315d6 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_80.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_80.mod
@@ -1,6 +1,3 @@
-[version]
-9.3
-
 [name]
 protonego-boot
 
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0.mod
index 975761c..cb91b4c 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0.mod
@@ -1,6 +1,3 @@
-[version]
-9.3
-
 [name]
 alpn-boot
 
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_05.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_05.mod
index 975761c..cb91b4c 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_05.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_05.mod
@@ -1,6 +1,3 @@
-[version]
-9.3
-
 [name]
 alpn-boot
 
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_11.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_11.mod
index 975761c..cb91b4c 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_11.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_11.mod
@@ -1,6 +1,3 @@
-[version]
-9.3
-
 [name]
 alpn-boot
 
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_20.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_20.mod
index 975761c..cb91b4c 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_20.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_20.mod
@@ -1,6 +1,3 @@
-[version]
-9.3
-
 [name]
 alpn-boot
 
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_25.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_25.mod
index 11a9c0e..6d6d75e 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_25.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_25.mod
@@ -1,6 +1,3 @@
-[version]
-9.3
-
 [name]
 alpn-boot
 
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_31.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_31.mod
index 11bad47..e52bd23 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_31.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_31.mod
@@ -1,6 +1,3 @@
-[version]
-9.3
-
 [name]
 alpn-boot
 
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_40.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_40.mod
index ad3a02f..4114979 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_40.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_40.mod
@@ -1,6 +1,3 @@
-[version]
-9.3
-
 [name]
 protonego-boot
 
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_45.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_45.mod
index ad3a02f..4114979 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_45.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_45.mod
@@ -1,6 +1,3 @@
-[version]
-9.3
-
 [name]
 protonego-boot
 
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn.mod
index a7d084d..7928e64 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn.mod
@@ -16,9 +16,6 @@
 # All versions of alpn-boot can be found at
 # http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/
 
-[version]
-9.3
-
 [name]
 alpn
 
@@ -38,15 +35,15 @@
 lib/alpn/
 
 [ini-template]
-# Overrides the order protocols are chosen by the server.
-# The default order is that specified by the order of the
-# modules declared in start.ini.
+## Overrides the order protocols are chosen by the server.
+## The default order is that specified by the order of the
+## modules declared in start.ini.
 # jetty.alpn.protocols=h2-16,http/1.1
 
-# Specifies what protocol to use when negotiation fails.
+## Specifies what protocol to use when negotiation fails.
 # jetty.alpn.defaultProtocol=http/1.1
 
-# ALPN debug logging on System.err
+## ALPN debug logging on System.err
 # jetty.alpn.debug=false
 
 [license]
diff --git a/jetty-annotations/src/main/config/modules/annotations.mod b/jetty-annotations/src/main/config/modules/annotations.mod
index 25488f4..65e4654 100644
--- a/jetty-annotations/src/main/config/modules/annotations.mod
+++ b/jetty-annotations/src/main/config/modules/annotations.mod
@@ -2,9 +2,6 @@
 # Jetty Annotation Scanning Module
 #
 
-[version]
-9.3
-
 [depend]
 # Annotations needs plus, and jndi features
 plus
diff --git a/jetty-cdi/cdi-servlet/src/main/config/modules/cdi.mod b/jetty-cdi/cdi-servlet/src/main/config/modules/cdi.mod
index 0c09808..ebffb55 100644
--- a/jetty-cdi/cdi-servlet/src/main/config/modules/cdi.mod
+++ b/jetty-cdi/cdi-servlet/src/main/config/modules/cdi.mod
@@ -1,10 +1,7 @@
 #
-# CDI / Weld Jetty module
+# [EXPERIMENTAL] CDI / Weld Jetty module
 #
 
-[version]
-9.3
-
 [depend]
 deploy
 annotations
diff --git a/jetty-client/src/main/config/modules/client.mod b/jetty-client/src/main/config/modules/client.mod
index fd0529e..39b58d4 100644
--- a/jetty-client/src/main/config/modules/client.mod
+++ b/jetty-client/src/main/config/modules/client.mod
@@ -2,8 +2,5 @@
 # Client Feature
 #
 
-[version]
-9.3
-
 [lib]
 lib/jetty-client-${jetty.version}.jar
diff --git a/jetty-deploy/src/main/config/modules/deploy.mod b/jetty-deploy/src/main/config/modules/deploy.mod
index ad62936..f567a20 100644
--- a/jetty-deploy/src/main/config/modules/deploy.mod
+++ b/jetty-deploy/src/main/config/modules/deploy.mod
@@ -2,9 +2,6 @@
 # Deploy Feature
 #
 
-[version]
-9.3
-
 [depend]
 webapp
 
diff --git a/jetty-distribution/src/main/resources/modules/hawtio.mod b/jetty-distribution/src/main/resources/modules/hawtio.mod
index 5a98ab8..f6d0d9d 100644
--- a/jetty-distribution/src/main/resources/modules/hawtio.mod
+++ b/jetty-distribution/src/main/resources/modules/hawtio.mod
@@ -2,9 +2,6 @@
 # Hawtio x module
 #
 
-[version]
-9.3
-
 [depend]
 stats
 deploy
@@ -25,7 +22,7 @@
 http://www.apache.org/licenses/LICENSE-2.0.html
 
 [ini-template]
-
+## Hawt.io configuration
 -Dhawtio.authenticationEnabled=false
 -Dhawtio.dirname=/dirname
 -Dhawtio.config.dir=${jetty.base}/etc/hawtio
diff --git a/jetty-distribution/src/main/resources/modules/jamon.mod b/jetty-distribution/src/main/resources/modules/jamon.mod
index 93589a3..2d1f144 100644
--- a/jetty-distribution/src/main/resources/modules/jamon.mod
+++ b/jetty-distribution/src/main/resources/modules/jamon.mod
@@ -2,9 +2,6 @@
 # JAMon Jetty module
 #
 
-[version]
-9.3
-
 [depend]
 stats
 deploy
@@ -28,6 +25,7 @@
 http://jamonapi.sourceforge.net/JAMonLicense.html
 
 [ini-template]
+## Jamon Configuration
+# jamon.summaryLabels=demo
 jamon.summaryLabels=default, request.getStatus().contextpath.value.ms
-#jamon.summaryLabels=demo
 
diff --git a/jetty-distribution/src/main/resources/modules/jminix.mod b/jetty-distribution/src/main/resources/modules/jminix.mod
index 785537c..05788f0 100644
--- a/jetty-distribution/src/main/resources/modules/jminix.mod
+++ b/jetty-distribution/src/main/resources/modules/jminix.mod
@@ -2,9 +2,6 @@
 # JaMON Jetty module
 #
 
-[version]
-9.3
-
 [depend]
 stats
 jmx
@@ -39,6 +36,6 @@
 http://www.apache.org/licenses/LICENSE-2.0
 
 [ini-template]
-# Jminix Configuration
+## Jminix Configuration
 jminix.port=8088
 
diff --git a/jetty-distribution/src/main/resources/modules/jolokia.mod b/jetty-distribution/src/main/resources/modules/jolokia.mod
index 0b1f664..da8ac8f 100644
--- a/jetty-distribution/src/main/resources/modules/jolokia.mod
+++ b/jetty-distribution/src/main/resources/modules/jolokia.mod
@@ -2,9 +2,6 @@
 # Jolokia Jetty module
 #
 
-[version]
-9.3
-
 [depend]
 stats
 deploy
diff --git a/jetty-distribution/src/main/resources/modules/jsp.mod b/jetty-distribution/src/main/resources/modules/jsp.mod
index 07b43b6..a16cc93 100644
--- a/jetty-distribution/src/main/resources/modules/jsp.mod
+++ b/jetty-distribution/src/main/resources/modules/jsp.mod
@@ -2,9 +2,6 @@
 # Jetty JSP Module
 #
 
-[version]
-9.3
-
 [depend]
 servlet
 annotations
diff --git a/jetty-distribution/src/main/resources/modules/jstl.mod b/jetty-distribution/src/main/resources/modules/jstl.mod
index 3a02136..efc310a 100644
--- a/jetty-distribution/src/main/resources/modules/jstl.mod
+++ b/jetty-distribution/src/main/resources/modules/jstl.mod
@@ -2,9 +2,6 @@
 # Jetty JSTL Module
 #
 
-[version]
-9.3
-
 [depend]
 jsp
 apache-jstl
diff --git a/jetty-distribution/src/main/resources/modules/setuid.mod b/jetty-distribution/src/main/resources/modules/setuid.mod
index 54fab8f..41ef757 100644
--- a/jetty-distribution/src/main/resources/modules/setuid.mod
+++ b/jetty-distribution/src/main/resources/modules/setuid.mod
@@ -2,9 +2,6 @@
 # Set UID Feature
 #
 
-[version]
-9.3
-
 [depend]
 server
 
diff --git a/jetty-fcgi/fcgi-server/src/main/config/modules/fcgi.mod b/jetty-fcgi/fcgi-server/src/main/config/modules/fcgi.mod
index 026bd27..14152d5 100644
--- a/jetty-fcgi/fcgi-server/src/main/config/modules/fcgi.mod
+++ b/jetty-fcgi/fcgi-server/src/main/config/modules/fcgi.mod
@@ -2,9 +2,6 @@
 # FastCGI Module
 #
 
-[version]
-9.3
-
 [depend]
 servlet
 client
diff --git a/jetty-http2/http2-server/src/main/config/modules/http2.mod b/jetty-http2/http2-server/src/main/config/modules/http2.mod
index d541aef..585c1fa 100644
--- a/jetty-http2/http2-server/src/main/config/modules/http2.mod
+++ b/jetty-http2/http2-server/src/main/config/modules/http2.mod
@@ -2,9 +2,6 @@
 # HTTP2 Support Module
 #
 
-[version]
-9.3
-
 [depend]
 ssl
 alpn
diff --git a/jetty-http2/http2-server/src/main/config/modules/http2c.mod b/jetty-http2/http2-server/src/main/config/modules/http2c.mod
index a165dfd..15883ca 100644
--- a/jetty-http2/http2-server/src/main/config/modules/http2c.mod
+++ b/jetty-http2/http2-server/src/main/config/modules/http2c.mod
@@ -5,9 +5,6 @@
 # The resulting connector will accept both HTTP/1 and HTTP/2 connections.
 #
 
-[version]
-9.3
-
 [depend]
 http
 
diff --git a/jetty-infinispan/src/main/config/modules/infinispan.mod b/jetty-infinispan/src/main/config/modules/infinispan.mod
index 2f04d18..afa39fc 100644
--- a/jetty-infinispan/src/main/config/modules/infinispan.mod
+++ b/jetty-infinispan/src/main/config/modules/infinispan.mod
@@ -2,14 +2,10 @@
 # Jetty Infinispan module
 #
 
-[version]
-9.3
-
 [depend]
 annotations
 webapp
 
-
 [files]
 maven://org.infinispan/infinispan-core/7.1.1.Final|lib/infinispan/infinispan-core-7.1.1.Final.jar
 maven://org.infinispan/infinispan-commons/7.1.1.Final|lib/infinispan/infinispan-commons-7.1.1.Final.jar
@@ -21,7 +17,6 @@
 lib/jetty-infinispan-${jetty.version}.jar
 lib/infinispan/*.jar
 
-
 [xml]
 etc/jetty-infinispan.xml
 
@@ -34,5 +29,5 @@
 ## Infinispan Session config
 
 ## Unique identifier for this node in the cluster
-jetty.infinispanSession.workerName=node1
+# jetty.infinispanSession.workerName=node1
 
diff --git a/jetty-jaas/src/main/config/modules/jaas.mod b/jetty-jaas/src/main/config/modules/jaas.mod
index 483aa65..fee3f59 100644
--- a/jetty-jaas/src/main/config/modules/jaas.mod
+++ b/jetty-jaas/src/main/config/modules/jaas.mod
@@ -2,9 +2,6 @@
 # JAAS Module
 #
 
-[version]
-9.3
-
 [depend]
 server
 
diff --git a/jetty-jaspi/src/main/config/modules/jaspi.mod b/jetty-jaspi/src/main/config/modules/jaspi.mod
index ab30b7d..e7019ae 100644
--- a/jetty-jaspi/src/main/config/modules/jaspi.mod
+++ b/jetty-jaspi/src/main/config/modules/jaspi.mod
@@ -2,9 +2,6 @@
 # Jetty JASPI Module
 #
 
-[version]
-9.3
-
 [depend]
 security
 
diff --git a/jetty-jmx/src/main/config/modules/jmx-remote.mod b/jetty-jmx/src/main/config/modules/jmx-remote.mod
index aeb2e16..f8a5111 100644
--- a/jetty-jmx/src/main/config/modules/jmx-remote.mod
+++ b/jetty-jmx/src/main/config/modules/jmx-remote.mod
@@ -2,9 +2,6 @@
 # JMX Remote Module
 #
 
-[version]
-9.3
-
 [depend]
 jmx
 
diff --git a/jetty-jmx/src/main/config/modules/jmx.mod b/jetty-jmx/src/main/config/modules/jmx.mod
index 21228e6..ee091c7 100644
--- a/jetty-jmx/src/main/config/modules/jmx.mod
+++ b/jetty-jmx/src/main/config/modules/jmx.mod
@@ -2,9 +2,6 @@
 # JMX Module
 #
 
-[version]
-9.3
-
 [depend]
 server
 
diff --git a/jetty-jndi/src/main/config/modules/jndi.mod b/jetty-jndi/src/main/config/modules/jndi.mod
index 4e36031..33c077c 100644
--- a/jetty-jndi/src/main/config/modules/jndi.mod
+++ b/jetty-jndi/src/main/config/modules/jndi.mod
@@ -2,9 +2,6 @@
 # JNDI Support
 #
 
-[version]
-9.3
-
 [depend]
 server
 
diff --git a/jetty-monitor/src/main/config/modules/monitor.mod b/jetty-monitor/src/main/config/modules/monitor.mod
index d573e59..09132c7 100644
--- a/jetty-monitor/src/main/config/modules/monitor.mod
+++ b/jetty-monitor/src/main/config/modules/monitor.mod
@@ -2,9 +2,6 @@
 # Jetty Monitor module
 #
 
-[version]
-9.3
-
 [depend]
 server
 client
diff --git a/jetty-nosql/src/main/config/modules/nosql.mod b/jetty-nosql/src/main/config/modules/nosql.mod
index bbefc7f..a5b5a9e 100644
--- a/jetty-nosql/src/main/config/modules/nosql.mod
+++ b/jetty-nosql/src/main/config/modules/nosql.mod
@@ -2,9 +2,6 @@
 # Jetty NoSql module
 #
 
-[version]
-9.3
-
 [depend]
 webapp
 
@@ -27,9 +24,8 @@
 ## MongoDB SessionIdManager config
 
 ## Unique identifier for this node in the cluster
-jetty.nosqlSession.workerName=node1
-
+# jetty.nosqlSession.workerName=node1
 
 ## Interval in seconds between scavenging expired sessions
-jetty.nosqlSession.scavenge=1800
+# jetty.nosqlSession.scavenge=1800
 
diff --git a/jetty-overlay-deployer/src/main/config/modules/overlay.mod b/jetty-overlay-deployer/src/main/config/modules/overlay.mod
index 289987b..87bf9e1 100644
--- a/jetty-overlay-deployer/src/main/config/modules/overlay.mod
+++ b/jetty-overlay-deployer/src/main/config/modules/overlay.mod
@@ -2,9 +2,6 @@
 # Jetty Overlay module
 #
 
-[version]
-9.3
-
 [depend]
 deploy
 
diff --git a/jetty-plus/src/main/config/modules/plus.mod b/jetty-plus/src/main/config/modules/plus.mod
index 4b5cdd5..aac0f8f 100644
--- a/jetty-plus/src/main/config/modules/plus.mod
+++ b/jetty-plus/src/main/config/modules/plus.mod
@@ -2,9 +2,6 @@
 # Jetty Plus module
 #
 
-[version]
-9.3
-
 [depend]
 server
 security
diff --git a/jetty-proxy/src/main/config/modules/proxy.mod b/jetty-proxy/src/main/config/modules/proxy.mod
index 9e48d54..6b91f68 100644
--- a/jetty-proxy/src/main/config/modules/proxy.mod
+++ b/jetty-proxy/src/main/config/modules/proxy.mod
@@ -2,9 +2,6 @@
 # Jetty Proxy module
 #
 
-[version]
-9.3
-
 [depend]
 servlet
 client
diff --git a/jetty-quickstart/src/main/config/modules/quickstart.mod b/jetty-quickstart/src/main/config/modules/quickstart.mod
index 6e5eee0..4e59dd0 100644
--- a/jetty-quickstart/src/main/config/modules/quickstart.mod
+++ b/jetty-quickstart/src/main/config/modules/quickstart.mod
@@ -2,14 +2,10 @@
 # Jetty Quickstart module
 #
 
-[version]
-9.3
-
 [depend]
 server
 plus
 annotations
 
-
 [lib]
 lib/jetty-quickstart-${jetty.version}.jar
diff --git a/jetty-rewrite/src/main/config/modules/rewrite.mod b/jetty-rewrite/src/main/config/modules/rewrite.mod
index cd55a1c..c8a1750 100644
--- a/jetty-rewrite/src/main/config/modules/rewrite.mod
+++ b/jetty-rewrite/src/main/config/modules/rewrite.mod
@@ -1,8 +1,6 @@
 #
 # Jetty Rewrite module
 #
-[version]
-9.3
 
 [depend]
 server
diff --git a/jetty-security/src/main/config/modules/security.mod b/jetty-security/src/main/config/modules/security.mod
index c9f9431..ba31632 100644
--- a/jetty-security/src/main/config/modules/security.mod
+++ b/jetty-security/src/main/config/modules/security.mod
@@ -2,9 +2,6 @@
 # Jetty Security Module
 #
 
-[version]
-9.3
-
 [depend]
 server
 
diff --git a/jetty-server/src/main/config/modules/continuation.mod b/jetty-server/src/main/config/modules/continuation.mod
index 48241fc..231c09d 100644
--- a/jetty-server/src/main/config/modules/continuation.mod
+++ b/jetty-server/src/main/config/modules/continuation.mod
@@ -2,8 +2,5 @@
 # Classic Jetty Continuation Support Module
 #
 
-[version]
-9.3
-
 [lib]
 lib/jetty-continuation-${jetty.version}.jar
diff --git a/jetty-server/src/main/config/modules/debuglog.mod b/jetty-server/src/main/config/modules/debuglog.mod
index 175523a..ba8b60a 100644
--- a/jetty-server/src/main/config/modules/debuglog.mod
+++ b/jetty-server/src/main/config/modules/debuglog.mod
@@ -2,9 +2,6 @@
 # Debug module
 #
 
-[version]
-9.3
-
 [depend]
 server
 
diff --git a/jetty-server/src/main/config/modules/ext.mod b/jetty-server/src/main/config/modules/ext.mod
index defe073..56b10f7 100644
--- a/jetty-server/src/main/config/modules/ext.mod
+++ b/jetty-server/src/main/config/modules/ext.mod
@@ -2,9 +2,6 @@
 # Module to add all lib/ext/**.jar files to classpath
 #
 
-[version]
-9.3
-
 [lib]
 lib/ext/**.jar
 
diff --git a/jetty-server/src/main/config/modules/gzip.mod b/jetty-server/src/main/config/modules/gzip.mod
index 3f318c4..1efc834 100644
--- a/jetty-server/src/main/config/modules/gzip.mod
+++ b/jetty-server/src/main/config/modules/gzip.mod
@@ -3,9 +3,6 @@
 # Applies GzipHandler to entire server
 #
 
-[version]
-9.3
-
 [depend]
 server
 
diff --git a/jetty-server/src/main/config/modules/home-base-warning.mod b/jetty-server/src/main/config/modules/home-base-warning.mod
index c84dbdc..28e5757 100644
--- a/jetty-server/src/main/config/modules/home-base-warning.mod
+++ b/jetty-server/src/main/config/modules/home-base-warning.mod
@@ -2,9 +2,6 @@
 # Home and Base Warning
 #
 
-[version]
-9.3
-
 [xml]
 etc/home-base-warning.xml
 
diff --git a/jetty-server/src/main/config/modules/http.mod b/jetty-server/src/main/config/modules/http.mod
index 6c3d26f..01e9862 100644
--- a/jetty-server/src/main/config/modules/http.mod
+++ b/jetty-server/src/main/config/modules/http.mod
@@ -2,9 +2,6 @@
 # Jetty HTTP Connector
 #
 
-[version]
-9.3
-
 [depend]
 server
 
diff --git a/jetty-server/src/main/config/modules/https.mod b/jetty-server/src/main/config/modules/https.mod
index 88e7c08..092e0d7 100644
--- a/jetty-server/src/main/config/modules/https.mod
+++ b/jetty-server/src/main/config/modules/https.mod
@@ -2,9 +2,6 @@
 # Jetty HTTPS Connector
 #
 
-[version]
-9.3
-
 [depend]
 ssl
 
diff --git a/jetty-server/src/main/config/modules/ipaccess.mod b/jetty-server/src/main/config/modules/ipaccess.mod
index caafa4c..956ea0f 100644
--- a/jetty-server/src/main/config/modules/ipaccess.mod
+++ b/jetty-server/src/main/config/modules/ipaccess.mod
@@ -2,9 +2,6 @@
 # IPAccess module
 #
 
-[version]
-9.3
-
 [depend]
 server
 
diff --git a/jetty-server/src/main/config/modules/jdbc-sessions.mod b/jetty-server/src/main/config/modules/jdbc-sessions.mod
index b597878..d77ff04 100644
--- a/jetty-server/src/main/config/modules/jdbc-sessions.mod
+++ b/jetty-server/src/main/config/modules/jdbc-sessions.mod
@@ -2,9 +2,6 @@
 # Jetty JDBC Session module
 #
 
-[version]
-9.3
-
 [depend]
 annotations
 webapp
@@ -17,14 +14,14 @@
 ## JDBC Session config
 
 ## Unique identifier for this node in the cluster
-jetty.jdbcSession.workerName=node1
+# jetty.jdbcSession.workerName=node1
 
 ## The interval in seconds between sweeps of the scavenger
-jetty.jdbcSession.scavenge=600
+# jetty.jdbcSession.scavenge=600
 
-##Uncomment either the datasource name or driverClass and connectionURL
-#jetty.jdbcSession.datasource=sessions
-#jetty.jdbcSession.driverClass=changeme
-#jetty.jdbcSession.connectionURL=changeme
+## Uncomment either the datasource name or driverClass and connectionURL
+# jetty.jdbcSession.datasource=sessions
+# jetty.jdbcSession.driverClass=changeme
+# jetty.jdbcSession.connectionURL=changeme
 
 
diff --git a/jetty-server/src/main/config/modules/jvm.mod b/jetty-server/src/main/config/modules/jvm.mod
index 6aa8c44..195521c 100644
--- a/jetty-server/src/main/config/modules/jvm.mod
+++ b/jetty-server/src/main/config/modules/jvm.mod
@@ -1,6 +1,3 @@
-[version]
-9.3
-
 [ini-template]
 ## JVM Configuration
 ## If JVM args are include in an ini file then --exec is needed
diff --git a/jetty-server/src/main/config/modules/lowresources.mod b/jetty-server/src/main/config/modules/lowresources.mod
index 72bf652..2f765d9 100644
--- a/jetty-server/src/main/config/modules/lowresources.mod
+++ b/jetty-server/src/main/config/modules/lowresources.mod
@@ -2,9 +2,6 @@
 # Low Resources module
 #
 
-[version]
-9.3
-
 [depend]
 server
 
diff --git a/jetty-server/src/main/config/modules/requestlog.mod b/jetty-server/src/main/config/modules/requestlog.mod
index a3afc06..e27b246 100644
--- a/jetty-server/src/main/config/modules/requestlog.mod
+++ b/jetty-server/src/main/config/modules/requestlog.mod
@@ -2,9 +2,6 @@
 # Request Log module
 #
 
-[version]
-9.3
-
 [depend]
 server
 
@@ -21,19 +18,19 @@
 ## File path
 # jetty.requestlog.filePath=${jetty.requestlog.dir}/yyyy_mm_dd.request.log
 
-# Date format for rollovered files (uses SimpleDateFormat syntax)
+## Date format for rollovered files (uses SimpleDateFormat syntax)
 # jetty.requestlog.filenameDateFormat=yyyy_MM_dd
 
-# How many days to retain old log files
+## How many days to retain old log files
 # jetty.requestlog.retainDays=90
 
 ## Whether to append to existing file
 # jetty.requestlog.append=true
 
-# Whether to use the extended log output
+## Whether to use the extended log output
 # jetty.requestlog.extended=true
 
-# Whether to log http cookie information
+## Whether to log http cookie information
 # jetty.requestlog.cookies=true
 
 ## Timezone of the log entries
diff --git a/jetty-server/src/main/config/modules/resources.mod b/jetty-server/src/main/config/modules/resources.mod
index 91eed41..8647d81 100644
--- a/jetty-server/src/main/config/modules/resources.mod
+++ b/jetty-server/src/main/config/modules/resources.mod
@@ -2,9 +2,6 @@
 # Module to add resources directory to classpath
 #
 
-[version]
-9.3
-
 [lib]
 resources/
 
diff --git a/jetty-server/src/main/config/modules/server.mod b/jetty-server/src/main/config/modules/server.mod
index 524017f..6b5dbe9 100644
--- a/jetty-server/src/main/config/modules/server.mod
+++ b/jetty-server/src/main/config/modules/server.mod
@@ -2,9 +2,6 @@
 # Base Server Module
 #
 
-[version]
-9.3
-
 [optional]
 jvm
 ext
diff --git a/jetty-server/src/main/config/modules/ssl.mod b/jetty-server/src/main/config/modules/ssl.mod
index d491f18..809543f 100644
--- a/jetty-server/src/main/config/modules/ssl.mod
+++ b/jetty-server/src/main/config/modules/ssl.mod
@@ -1,8 +1,6 @@
 #
 # SSL Keystore module
 #
-[version]
-9.3
 
 [name]
 ssl
diff --git a/jetty-server/src/main/config/modules/stats.mod b/jetty-server/src/main/config/modules/stats.mod
index 0212f87..0922469 100644
--- a/jetty-server/src/main/config/modules/stats.mod
+++ b/jetty-server/src/main/config/modules/stats.mod
@@ -2,9 +2,6 @@
 # Stats module
 #
 
-[version]
-9.3
-
 [depend]
 server
 
diff --git a/jetty-servlet/src/main/config/modules/servlet.mod b/jetty-servlet/src/main/config/modules/servlet.mod
index 65bf86f..fdb65c5 100644
--- a/jetty-servlet/src/main/config/modules/servlet.mod
+++ b/jetty-servlet/src/main/config/modules/servlet.mod
@@ -2,9 +2,6 @@
 # Jetty Servlet Module
 #
 
-[version]
-9.3
-
 [depend]
 server
 
diff --git a/jetty-servlets/src/main/config/modules/servlets.mod b/jetty-servlets/src/main/config/modules/servlets.mod
index 453a938..2e977c0 100644
--- a/jetty-servlets/src/main/config/modules/servlets.mod
+++ b/jetty-servlets/src/main/config/modules/servlets.mod
@@ -2,8 +2,6 @@
 # Jetty Servlets Module
 #
 
-[version]
-9.3
 
 [depend]
 servlet
diff --git a/jetty-spring/src/main/config/modules/spring.mod b/jetty-spring/src/main/config/modules/spring.mod
index 0e11358..39b9b8d 100644
--- a/jetty-spring/src/main/config/modules/spring.mod
+++ b/jetty-spring/src/main/config/modules/spring.mod
@@ -1,8 +1,6 @@
 #
 # Spring
 #
-[version]
-9.3
 
 [name]
 spring
diff --git a/jetty-util/src/main/config/modules/logging.mod b/jetty-util/src/main/config/modules/logging.mod
index 2a17a58..4f30a88 100644
--- a/jetty-util/src/main/config/modules/logging.mod
+++ b/jetty-util/src/main/config/modules/logging.mod
@@ -2,9 +2,6 @@
 # Jetty std err/out logging
 #
 
-[version]
-9.3
-
 [xml]
 etc/jetty-logging.xml
 
@@ -17,13 +14,13 @@
 
 [ini-template]
 ## Logging Configuration
-# Configure jetty logging for default internal behavior STDERR output
+## Configure jetty logging for default internal behavior STDERR output
 # -Dorg.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog
 
-# Configure jetty logging for slf4j
+## Configure jetty logging for slf4j
 # -Dorg.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.Slf4jLog
 
-# Configure jetty logging for java.util.logging
+## Configure jetty logging for java.util.logging
 # -Dorg.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.JavaUtilLog
 
 ## Logging directory (relative to $jetty.base)
diff --git a/jetty-webapp/src/main/config/modules/webapp.mod b/jetty-webapp/src/main/config/modules/webapp.mod
index 3f889b6..6bb37ef 100644
--- a/jetty-webapp/src/main/config/modules/webapp.mod
+++ b/jetty-webapp/src/main/config/modules/webapp.mod
@@ -2,9 +2,6 @@
 # WebApp Support Module
 #
 
-[version]
-9.3
-
 [depend]
 servlet
 security
diff --git a/jetty-websocket/javax-websocket-server-impl/src/main/config/modules/websocket.mod b/jetty-websocket/javax-websocket-server-impl/src/main/config/modules/websocket.mod
index 768bcc8..e866b17 100644
--- a/jetty-websocket/javax-websocket-server-impl/src/main/config/modules/websocket.mod
+++ b/jetty-websocket/javax-websocket-server-impl/src/main/config/modules/websocket.mod
@@ -2,9 +2,6 @@
 # WebSocket Module
 #
 
-[version]
-9.3
-
 [depend]
 # javax.websocket needs annotations
 annotations