diff --git a/NetPyNE/ACnet/Ca_pyr.mod b/NetPyNE/ACnet/Ca_pyr.mod
index e00c2d8..835e79d 100644
--- a/NetPyNE/ACnet/Ca_pyr.mod
+++ b/NetPyNE/ACnet/Ca_pyr.mod
@@ -243,10 +243,6 @@ PROCEDURE rates() {
      
     
      
-    
-     
-    
-     
     
      
     
diff --git a/NetPyNE/ACnet/Kahp_pyr.mod b/NetPyNE/ACnet/Kahp_pyr.mod
index ebc5ed7..dce5853 100644
--- a/NetPyNE/ACnet/Kahp_pyr.mod
+++ b/NetPyNE/ACnet/Kahp_pyr.mod
@@ -204,10 +204,6 @@ PROCEDURE rates() {
      
     
      
-    
-     
-    
-     
     
      
     
diff --git a/NetPyNE/ACnet/Kdr_bask.mod b/NetPyNE/ACnet/Kdr_bask.mod
index 673120e..d7fc6b9 100644
--- a/NetPyNE/ACnet/Kdr_bask.mod
+++ b/NetPyNE/ACnet/Kdr_bask.mod
@@ -187,10 +187,6 @@ PROCEDURE rates() {
      
     
      
-    
-     
-    
-     
     
      
     
diff --git a/NetPyNE/ACnet/Kdr_pyr.mod b/NetPyNE/ACnet/Kdr_pyr.mod
index 3a7f018..e00996c 100644
--- a/NetPyNE/ACnet/Kdr_pyr.mod
+++ b/NetPyNE/ACnet/Kdr_pyr.mod
@@ -187,10 +187,6 @@ PROCEDURE rates() {
      
     
      
-    
-     
-    
-     
     
      
     
diff --git a/NetPyNE/ACnet/Na_bask.mod b/NetPyNE/ACnet/Na_bask.mod
index 7bd6915..02e2b7c 100644
--- a/NetPyNE/ACnet/Na_bask.mod
+++ b/NetPyNE/ACnet/Na_bask.mod
@@ -249,10 +249,6 @@ PROCEDURE rates() {
      
     
      
-    
-     
-    
-     
     
      
     
diff --git a/NetPyNE/ACnet/Na_pyr.mod b/NetPyNE/ACnet/Na_pyr.mod
index ea688c9..f360600 100644
--- a/NetPyNE/ACnet/Na_pyr.mod
+++ b/NetPyNE/ACnet/Na_pyr.mod
@@ -247,10 +247,6 @@ PROCEDURE rates() {
      
     
      
-    
-     
-    
-     
     
      
     
diff --git a/NetPyNE/TwoCells/Ca_pyr.mod b/NetPyNE/TwoCells/Ca_pyr.mod
index e00c2d8..835e79d 100644
--- a/NetPyNE/TwoCells/Ca_pyr.mod
+++ b/NetPyNE/TwoCells/Ca_pyr.mod
@@ -243,10 +243,6 @@ PROCEDURE rates() {
      
     
      
-    
-     
-    
-     
     
      
     
diff --git a/NetPyNE/TwoCells/Kahp_pyr.mod b/NetPyNE/TwoCells/Kahp_pyr.mod
index ebc5ed7..dce5853 100644
--- a/NetPyNE/TwoCells/Kahp_pyr.mod
+++ b/NetPyNE/TwoCells/Kahp_pyr.mod
@@ -204,10 +204,6 @@ PROCEDURE rates() {
      
     
      
-    
-     
-    
-     
     
      
     
diff --git a/NetPyNE/TwoCells/Kdr_bask.mod b/NetPyNE/TwoCells/Kdr_bask.mod
index 673120e..d7fc6b9 100644
--- a/NetPyNE/TwoCells/Kdr_bask.mod
+++ b/NetPyNE/TwoCells/Kdr_bask.mod
@@ -187,10 +187,6 @@ PROCEDURE rates() {
      
     
      
-    
-     
-    
-     
     
      
     
diff --git a/NetPyNE/TwoCells/Kdr_pyr.mod b/NetPyNE/TwoCells/Kdr_pyr.mod
index 3a7f018..e00996c 100644
--- a/NetPyNE/TwoCells/Kdr_pyr.mod
+++ b/NetPyNE/TwoCells/Kdr_pyr.mod
@@ -187,10 +187,6 @@ PROCEDURE rates() {
      
     
      
-    
-     
-    
-     
     
      
     
diff --git a/NetPyNE/TwoCells/Na_bask.mod b/NetPyNE/TwoCells/Na_bask.mod
index 7bd6915..02e2b7c 100644
--- a/NetPyNE/TwoCells/Na_bask.mod
+++ b/NetPyNE/TwoCells/Na_bask.mod
@@ -249,10 +249,6 @@ PROCEDURE rates() {
      
     
      
-    
-     
-    
-     
     
      
     
diff --git a/NetPyNE/TwoCells/Na_pyr.mod b/NetPyNE/TwoCells/Na_pyr.mod
index ea688c9..f360600 100644
--- a/NetPyNE/TwoCells/Na_pyr.mod
+++ b/NetPyNE/TwoCells/Na_pyr.mod
@@ -247,10 +247,6 @@ PROCEDURE rates() {
      
     
      
-    
-     
-    
-     
     
      
     
diff --git a/NeuroML2/HHSmall.net.nml b/NeuroML2/HHSmall.net.nml
index 4899c75..1587f7d 100644
--- a/NeuroML2/HHSmall.net.nml
+++ b/NeuroML2/HHSmall.net.nml
@@ -1,4 +1,4 @@
-<neuroml xmlns="http://www.neuroml.org/schema/neuroml2"  xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.neuroml.org/schema/neuroml2 https://raw.github.com/NeuroML/NeuroML2/development/Schemas/NeuroML2/NeuroML_v2.3.xsd" id="HHSmall">
+<neuroml xmlns="http://www.neuroml.org/schema/neuroml2"  xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.neuroml.org/schema/neuroml2 https://raw.github.com/NeuroML/NeuroML2/development/Schemas/NeuroML2/NeuroML_v2.3.1.xsd" id="HHSmall">
     <notes>NeuroML 2 file exported from NetPyNE v1.0.6</notes>
     <ionChannelHH id="leak_hh" type="ionChannelPassive" conductance="10pS">
         <notes>Single ion channel in NeuroML2 format: passive channel providing a leak conductance </notes>
diff --git a/NeuroML2/HybridSmall.net.nml b/NeuroML2/HybridSmall.net.nml
index 189e2d0..bec71f5 100644
--- a/NeuroML2/HybridSmall.net.nml
+++ b/NeuroML2/HybridSmall.net.nml
@@ -1,4 +1,4 @@
-<neuroml xmlns="http://www.neuroml.org/schema/neuroml2"  xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.neuroml.org/schema/neuroml2 https://raw.github.com/NeuroML/NeuroML2/development/Schemas/NeuroML2/NeuroML_v2.3.xsd" id="HybridSmall">
+<neuroml xmlns="http://www.neuroml.org/schema/neuroml2"  xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.neuroml.org/schema/neuroml2 https://raw.github.com/NeuroML/NeuroML2/development/Schemas/NeuroML2/NeuroML_v2.3.1.xsd" id="HybridSmall">
     <notes>NeuroML 2 file exported from NetPyNE v1.0.6</notes>
     <ionChannelHH id="leak_hh" type="ionChannelPassive" conductance="10pS">
         <notes>Single ion channel in NeuroML2 format: passive channel providing a leak conductance </notes>
diff --git a/NeuroML2/HybridTut.net.nml b/NeuroML2/HybridTut.net.nml
index 7b9ac2d..9a6a592 100644
--- a/NeuroML2/HybridTut.net.nml
+++ b/NeuroML2/HybridTut.net.nml
@@ -1,4 +1,4 @@
-<neuroml xmlns="http://www.neuroml.org/schema/neuroml2"  xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.neuroml.org/schema/neuroml2 https://raw.github.com/NeuroML/NeuroML2/development/Schemas/NeuroML2/NeuroML_v2.3.xsd" id="HybridTut">
+<neuroml xmlns="http://www.neuroml.org/schema/neuroml2"  xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.neuroml.org/schema/neuroml2 https://raw.github.com/NeuroML/NeuroML2/development/Schemas/NeuroML2/NeuroML_v2.3.1.xsd" id="HybridTut">
     <notes>NeuroML 2 file exported from NetPyNE v1.0.6</notes>
     <ionChannelHH id="leak_hh" type="ionChannelPassive" conductance="10pS">
         <notes>Single ion channel in NeuroML2 format: passive channel providing a leak conductance </notes>
diff --git a/NeuroML2/LEMS_HHSmall.xml b/NeuroML2/LEMS_HHSmall.xml
index e34ac24..3141cb5 100644
--- a/NeuroML2/LEMS_HHSmall.xml
+++ b/NeuroML2/LEMS_HHSmall.xml
@@ -2,7 +2,7 @@
 
     <!-- 
 
-        This LEMS file has been automatically generated using PyNeuroML v1.2.13 (libNeuroML v0.5.9)
+        This LEMS file has been automatically generated using PyNeuroML v1.2.15 (libNeuroML v0.6.0)
 
      -->
 
diff --git a/NeuroML2/LEMS_HybridSmall.xml b/NeuroML2/LEMS_HybridSmall.xml
index b5691ef..977a62e 100644
--- a/NeuroML2/LEMS_HybridSmall.xml
+++ b/NeuroML2/LEMS_HybridSmall.xml
@@ -2,7 +2,7 @@
 
     <!-- 
 
-        This LEMS file has been automatically generated using PyNeuroML v1.2.13 (libNeuroML v0.5.9)
+        This LEMS file has been automatically generated using PyNeuroML v1.2.15 (libNeuroML v0.6.0)
 
      -->
 
diff --git a/NeuroML2/LEMS_HybridTut.xml b/NeuroML2/LEMS_HybridTut.xml
index 72eb7e3..706ec00 100644
--- a/NeuroML2/LEMS_HybridTut.xml
+++ b/NeuroML2/LEMS_HybridTut.xml
@@ -2,7 +2,7 @@
 
     <!-- 
 
-        This LEMS file has been automatically generated using PyNeuroML v1.2.13 (libNeuroML v0.5.9)
+        This LEMS file has been automatically generated using PyNeuroML v1.2.15 (libNeuroML v0.6.0)
 
      -->
 
diff --git a/NeuroML2/LEMS_M1.xml b/NeuroML2/LEMS_M1.xml
index 1e7f0f7..cc4da77 100644
--- a/NeuroML2/LEMS_M1.xml
+++ b/NeuroML2/LEMS_M1.xml
@@ -2,7 +2,7 @@
 
     <!-- 
 
-        This LEMS file has been automatically generated using PyNeuroML v1.2.13 (libNeuroML v0.5.9)
+        This LEMS file has been automatically generated using PyNeuroML v1.2.15 (libNeuroML v0.6.0)
 
      -->
 
diff --git a/NeuroML2/M1.net.nml b/NeuroML2/M1.net.nml
index 3bf0f30..41dbca7 100644
--- a/NeuroML2/M1.net.nml
+++ b/NeuroML2/M1.net.nml
@@ -1,4 +1,4 @@
-<neuroml xmlns="http://www.neuroml.org/schema/neuroml2"  xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.neuroml.org/schema/neuroml2 https://raw.github.com/NeuroML/NeuroML2/development/Schemas/NeuroML2/NeuroML_v2.3.xsd" id="M1">
+<neuroml xmlns="http://www.neuroml.org/schema/neuroml2"  xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.neuroml.org/schema/neuroml2 https://raw.github.com/NeuroML/NeuroML2/development/Schemas/NeuroML2/NeuroML_v2.3.1.xsd" id="M1">
     <notes>NeuroML 2 file exported from NetPyNE v1.0.6</notes>
     <expTwoSynapse id="AMPA" gbase="1uS" erev="0mV" tauDecay="5.3ms" tauRise="0.05ms"/>
     <expTwoSynapse id="NMDA" gbase="1uS" erev="0mV" tauDecay="15ms" tauRise="0.15ms"/>