diff --git a/src/sbml/packages/comp/extension/CompModelPlugin.cpp b/src/sbml/packages/comp/extension/CompModelPlugin.cpp
index c3f817e287..f6bb0f198c 100644
--- a/src/sbml/packages/comp/extension/CompModelPlugin.cpp
+++ b/src/sbml/packages/comp/extension/CompModelPlugin.cpp
@@ -286,10 +286,6 @@ CompModelPlugin::addSubmodel (const Submodel* submodel)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != submodel->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (getPackageVersion() != submodel->getPackageVersion())
   {
     return LIBSBML_PKG_VERSION_MISMATCH;
@@ -427,10 +423,6 @@ CompModelPlugin::addPort (const Port* port)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != port->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (getPackageVersion() != port->getPackageVersion())
   {
     return LIBSBML_PKG_VERSION_MISMATCH;
diff --git a/src/sbml/packages/comp/extension/CompSBMLDocumentPlugin.cpp b/src/sbml/packages/comp/extension/CompSBMLDocumentPlugin.cpp
index 47f84f6890..a7a9bcb330 100644
--- a/src/sbml/packages/comp/extension/CompSBMLDocumentPlugin.cpp
+++ b/src/sbml/packages/comp/extension/CompSBMLDocumentPlugin.cpp
@@ -373,10 +373,6 @@ CompSBMLDocumentPlugin::addModelDefinition (const ModelDefinition* modelDefiniti
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != modelDefinition->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (getPackageVersion() != modelDefinition->getPackageVersion())
   {
     return LIBSBML_PKG_VERSION_MISMATCH;
@@ -511,10 +507,6 @@ CompSBMLDocumentPlugin::addExternalModelDefinition (const ExternalModelDefinitio
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != externalModelDefinition->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (getPackageVersion() != externalModelDefinition->getPackageVersion())
   {
     return LIBSBML_PKG_VERSION_MISMATCH;
diff --git a/src/sbml/packages/comp/extension/CompSBasePlugin.cpp b/src/sbml/packages/comp/extension/CompSBasePlugin.cpp
index c1176f9376..2681f9fe5a 100644
--- a/src/sbml/packages/comp/extension/CompSBasePlugin.cpp
+++ b/src/sbml/packages/comp/extension/CompSBasePlugin.cpp
@@ -336,10 +336,6 @@ CompSBasePlugin::addReplacedElement (const ReplacedElement* replacedElement)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != replacedElement->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (getPackageVersion() != replacedElement->getPackageVersion())
   {
     return LIBSBML_PKG_VERSION_MISMATCH;
@@ -423,10 +419,6 @@ CompSBasePlugin::setReplacedBy (const ReplacedBy* replacedBy)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != replacedBy->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (getPackageVersion() != replacedBy->getPackageVersion())
   {
     return LIBSBML_PKG_VERSION_MISMATCH;
diff --git a/src/sbml/packages/comp/sbml/SBaseRef.cpp b/src/sbml/packages/comp/sbml/SBaseRef.cpp
index 6689cdf717..ae03ddbd97 100644
--- a/src/sbml/packages/comp/sbml/SBaseRef.cpp
+++ b/src/sbml/packages/comp/sbml/SBaseRef.cpp
@@ -474,10 +474,6 @@ SBaseRef::setSBaseRef (const SBaseRef* sBaseRef)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != sBaseRef->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (getPackageVersion() != sBaseRef->getPackageVersion())
   {
     return LIBSBML_PKG_VERSION_MISMATCH;
diff --git a/src/sbml/packages/comp/sbml/Submodel.cpp b/src/sbml/packages/comp/sbml/Submodel.cpp
index 0ba0245279..123fc6ade9 100644
--- a/src/sbml/packages/comp/sbml/Submodel.cpp
+++ b/src/sbml/packages/comp/sbml/Submodel.cpp
@@ -474,10 +474,6 @@ Submodel::addDeletion (const Deletion* deletion)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != deletion->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (getPackageVersion() != deletion->getPackageVersion())
   {
     return LIBSBML_PKG_VERSION_MISMATCH;
diff --git a/src/sbml/packages/distrib/extension/DistribSBasePlugin.cpp b/src/sbml/packages/distrib/extension/DistribSBasePlugin.cpp
index dab92466b9..9c4c1f6b18 100644
--- a/src/sbml/packages/distrib/extension/DistribSBasePlugin.cpp
+++ b/src/sbml/packages/distrib/extension/DistribSBasePlugin.cpp
@@ -175,10 +175,6 @@ DistribSBasePlugin::addUncertainty(const Uncertainty* u)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != u->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (getPackageVersion() != u->getPackageVersion())
   {
     return LIBSBML_PKG_VERSION_MISMATCH;
diff --git a/src/sbml/packages/distrib/sbml/ListOfUncertParameters.cpp b/src/sbml/packages/distrib/sbml/ListOfUncertParameters.cpp
index 14c6295a06..50ec94d8e8 100644
--- a/src/sbml/packages/distrib/sbml/ListOfUncertParameters.cpp
+++ b/src/sbml/packages/distrib/sbml/ListOfUncertParameters.cpp
@@ -220,10 +220,6 @@ ListOfUncertParameters::addUncertParameter(const UncertParameter* up)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != up->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(up)) == false)
   {
@@ -254,10 +250,6 @@ ListOfUncertParameters::addUncertSpan(const UncertSpan* up)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != up->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(up)) == false)
   {
diff --git a/src/sbml/packages/distrib/sbml/ListOfUncertainties.cpp b/src/sbml/packages/distrib/sbml/ListOfUncertainties.cpp
index 421d95c1e2..0022f3c41e 100644
--- a/src/sbml/packages/distrib/sbml/ListOfUncertainties.cpp
+++ b/src/sbml/packages/distrib/sbml/ListOfUncertainties.cpp
@@ -217,10 +217,6 @@ ListOfUncertainties::addUncertainty(const Uncertainty* u)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != u->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(u)) == false)
   {
diff --git a/src/sbml/packages/distrib/sbml/UncertParameter.cpp b/src/sbml/packages/distrib/sbml/UncertParameter.cpp
index b0a51c63f0..9dc4b81c87 100644
--- a/src/sbml/packages/distrib/sbml/UncertParameter.cpp
+++ b/src/sbml/packages/distrib/sbml/UncertParameter.cpp
@@ -647,10 +647,6 @@ UncertParameter::addUncertParameter(const UncertParameter* up1)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != up1->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(up1)) == false)
   {
@@ -681,10 +677,6 @@ UncertParameter::addUncertSpan(const UncertSpan* up1)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != up1->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(up1)) == false)
   {
diff --git a/src/sbml/packages/distrib/sbml/Uncertainty.cpp b/src/sbml/packages/distrib/sbml/Uncertainty.cpp
index 37638475c5..f2c41bd9c9 100644
--- a/src/sbml/packages/distrib/sbml/Uncertainty.cpp
+++ b/src/sbml/packages/distrib/sbml/Uncertainty.cpp
@@ -226,10 +226,6 @@ Uncertainty::addUncertParameter(const UncertParameter* up)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != up->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(up)) == false)
   {
@@ -260,10 +256,6 @@ Uncertainty::addUncertSpan(const UncertSpan* up)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != up->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(up)) == false)
   {
diff --git a/src/sbml/packages/groups/extension/GroupsModelPlugin.cpp b/src/sbml/packages/groups/extension/GroupsModelPlugin.cpp
index 244900f056..7b3e730988 100644
--- a/src/sbml/packages/groups/extension/GroupsModelPlugin.cpp
+++ b/src/sbml/packages/groups/extension/GroupsModelPlugin.cpp
@@ -195,10 +195,6 @@ GroupsModelPlugin::addGroup(const Group* g)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != g->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (getPackageVersion() != g->getPackageVersion())
   {
     return LIBSBML_PKG_VERSION_MISMATCH;
diff --git a/src/sbml/packages/groups/sbml/Group.cpp b/src/sbml/packages/groups/sbml/Group.cpp
index 54918676d0..a198996239 100644
--- a/src/sbml/packages/groups/sbml/Group.cpp
+++ b/src/sbml/packages/groups/sbml/Group.cpp
@@ -410,10 +410,6 @@ Group::addMember(const Member* m)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != m->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(m)) == false)
   {
diff --git a/src/sbml/packages/groups/sbml/ListOfGroups.cpp b/src/sbml/packages/groups/sbml/ListOfGroups.cpp
index b4611463cf..45159a2ed7 100644
--- a/src/sbml/packages/groups/sbml/ListOfGroups.cpp
+++ b/src/sbml/packages/groups/sbml/ListOfGroups.cpp
@@ -212,10 +212,6 @@ ListOfGroups::addGroup(const Group* g)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != g->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(g)) == false)
   {
diff --git a/src/sbml/packages/groups/sbml/ListOfMembers.cpp b/src/sbml/packages/groups/sbml/ListOfMembers.cpp
index 431acf7143..8a6bf6cca7 100644
--- a/src/sbml/packages/groups/sbml/ListOfMembers.cpp
+++ b/src/sbml/packages/groups/sbml/ListOfMembers.cpp
@@ -312,10 +312,6 @@ ListOfMembers::addMember(const Member* m)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != m->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(m)) == false)
   {
diff --git a/src/sbml/packages/layout/extension/LayoutModelPlugin.cpp b/src/sbml/packages/layout/extension/LayoutModelPlugin.cpp
index f71456b31e..e1041e7e26 100644
--- a/src/sbml/packages/layout/extension/LayoutModelPlugin.cpp
+++ b/src/sbml/packages/layout/extension/LayoutModelPlugin.cpp
@@ -452,10 +452,6 @@ LayoutModelPlugin::addLayout (const Layout* layout)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != layout->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (getPackageVersion() != layout->getPackageVersion())
   {
     return LIBSBML_PKG_VERSION_MISMATCH;
diff --git a/src/sbml/packages/layout/sbml/Curve.cpp b/src/sbml/packages/layout/sbml/Curve.cpp
index bfcd0615c5..36e97a1d16 100644
--- a/src/sbml/packages/layout/sbml/Curve.cpp
+++ b/src/sbml/packages/layout/sbml/Curve.cpp
@@ -330,10 +330,6 @@ Curve::addCurveSegment (const LineSegment* segment)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != segment->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(segment)) == false)
   {
diff --git a/src/sbml/packages/layout/sbml/GeneralGlyph.cpp b/src/sbml/packages/layout/sbml/GeneralGlyph.cpp
index 3dac55b978..f0887b309b 100644
--- a/src/sbml/packages/layout/sbml/GeneralGlyph.cpp
+++ b/src/sbml/packages/layout/sbml/GeneralGlyph.cpp
@@ -523,10 +523,6 @@ GeneralGlyph::addReferenceGlyph (const ReferenceGlyph* glyph)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != glyph->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (getPackageVersion() != glyph->getPackageVersion())
   {
     return LIBSBML_PKG_VERSION_MISMATCH;
@@ -555,10 +551,6 @@ GeneralGlyph::addSubGlyph (const GraphicalObject* glyph)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != glyph->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (getPackageVersion() != glyph->getPackageVersion())
   {
     return LIBSBML_PKG_VERSION_MISMATCH;
diff --git a/src/sbml/packages/layout/sbml/Layout.cpp b/src/sbml/packages/layout/sbml/Layout.cpp
index af1fb08496..88e2882b3b 100644
--- a/src/sbml/packages/layout/sbml/Layout.cpp
+++ b/src/sbml/packages/layout/sbml/Layout.cpp
@@ -1156,10 +1156,6 @@ Layout::addCompartmentGlyph (const CompartmentGlyph* glyph)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != glyph->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (getPackageVersion() != glyph->getPackageVersion())
   {
     return LIBSBML_PKG_VERSION_MISMATCH;
@@ -1189,10 +1185,6 @@ Layout::addSpeciesGlyph (const SpeciesGlyph* glyph)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != glyph->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (getPackageVersion() != glyph->getPackageVersion())
   {
     return LIBSBML_PKG_VERSION_MISMATCH;
@@ -1222,10 +1214,6 @@ Layout::addReactionGlyph (const ReactionGlyph* glyph)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != glyph->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (getPackageVersion() != glyph->getPackageVersion())
   {
     return LIBSBML_PKG_VERSION_MISMATCH;
@@ -1255,10 +1243,6 @@ Layout::addTextGlyph (const TextGlyph* glyph)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != glyph->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (getPackageVersion() != glyph->getPackageVersion())
   {
     return LIBSBML_PKG_VERSION_MISMATCH;
@@ -1288,10 +1272,6 @@ Layout::addAdditionalGraphicalObject (const GraphicalObject* glyph)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != glyph->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (getPackageVersion() != glyph->getPackageVersion())
   {
     return LIBSBML_PKG_VERSION_MISMATCH;
diff --git a/src/sbml/packages/layout/sbml/ReactionGlyph.cpp b/src/sbml/packages/layout/sbml/ReactionGlyph.cpp
index 02d7eee635..8754bfa326 100644
--- a/src/sbml/packages/layout/sbml/ReactionGlyph.cpp
+++ b/src/sbml/packages/layout/sbml/ReactionGlyph.cpp
@@ -411,10 +411,6 @@ ReactionGlyph::addSpeciesReferenceGlyph (const SpeciesReferenceGlyph* glyph)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != glyph->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (getPackageVersion() != glyph->getPackageVersion())
   {
     return LIBSBML_PKG_VERSION_MISMATCH;
diff --git a/src/sbml/packages/multi/extension/MultiCompartmentPlugin.cpp b/src/sbml/packages/multi/extension/MultiCompartmentPlugin.cpp
index 5dd8712940..4c092dffde 100644
--- a/src/sbml/packages/multi/extension/MultiCompartmentPlugin.cpp
+++ b/src/sbml/packages/multi/extension/MultiCompartmentPlugin.cpp
@@ -556,10 +556,6 @@ MultiCompartmentPlugin::addCompartmentReference (const CompartmentReference* com
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != compartmentReference->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (getPackageVersion() != compartmentReference->getPackageVersion())
   {
     return LIBSBML_PKG_VERSION_MISMATCH;
diff --git a/src/sbml/packages/multi/extension/MultiModelPlugin.cpp b/src/sbml/packages/multi/extension/MultiModelPlugin.cpp
index 676aeb1ad0..5550530a3d 100644
--- a/src/sbml/packages/multi/extension/MultiModelPlugin.cpp
+++ b/src/sbml/packages/multi/extension/MultiModelPlugin.cpp
@@ -294,10 +294,6 @@ MultiModelPlugin::addMultiSpeciesType (const MultiSpeciesType* multiSpeciesType)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != multiSpeciesType->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (getPackageVersion() != multiSpeciesType->getPackageVersion())
   {
     return LIBSBML_PKG_VERSION_MISMATCH;
diff --git a/src/sbml/packages/multi/extension/MultiSpeciesPlugin.cpp b/src/sbml/packages/multi/extension/MultiSpeciesPlugin.cpp
index 6458d8508d..1930b2ecd5 100644
--- a/src/sbml/packages/multi/extension/MultiSpeciesPlugin.cpp
+++ b/src/sbml/packages/multi/extension/MultiSpeciesPlugin.cpp
@@ -453,10 +453,6 @@ MultiSpeciesPlugin::addOutwardBindingSite (const OutwardBindingSite* outwardBind
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != outwardBindingSite->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (getPackageVersion() != outwardBindingSite->getPackageVersion())
   {
     return LIBSBML_PKG_VERSION_MISMATCH;
@@ -606,10 +602,6 @@ MultiSpeciesPlugin::addSpeciesFeature (const SpeciesFeature* speciesFeature)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != speciesFeature->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (getPackageVersion() != speciesFeature->getPackageVersion())
   {
     return LIBSBML_PKG_VERSION_MISMATCH;
@@ -708,10 +700,6 @@ MultiSpeciesPlugin::addSubListOfSpeciesFeatures (SubListOfSpeciesFeatures* subLi
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != subListOfSpeciesFeatures->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (getPackageVersion() != subListOfSpeciesFeatures->getPackageVersion())
   {
     return LIBSBML_PKG_VERSION_MISMATCH;
diff --git a/src/sbml/packages/multi/extension/MultiSpeciesReferencePlugin.cpp b/src/sbml/packages/multi/extension/MultiSpeciesReferencePlugin.cpp
index 6815ceba9b..730d0a4d69 100644
--- a/src/sbml/packages/multi/extension/MultiSpeciesReferencePlugin.cpp
+++ b/src/sbml/packages/multi/extension/MultiSpeciesReferencePlugin.cpp
@@ -268,10 +268,6 @@ MultiSpeciesReferencePlugin::addSpeciesTypeComponentMapInProduct (const SpeciesT
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != speciesTypeComponentMapInProduct->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (getPackageVersion() != speciesTypeComponentMapInProduct->getPackageVersion())
   {
     return LIBSBML_PKG_VERSION_MISMATCH;
diff --git a/src/sbml/packages/multi/sbml/MultiSpeciesType.cpp b/src/sbml/packages/multi/sbml/MultiSpeciesType.cpp
index ae8561d8e2..613bdd7268 100644
--- a/src/sbml/packages/multi/sbml/MultiSpeciesType.cpp
+++ b/src/sbml/packages/multi/sbml/MultiSpeciesType.cpp
@@ -414,10 +414,6 @@ MultiSpeciesType::addSpeciesFeatureType(const SpeciesFeatureType* sft)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != sft->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const SBase *>(sft)) == false)
   {
     return LIBSBML_NAMESPACES_MISMATCH;
@@ -571,10 +567,6 @@ MultiSpeciesType::addSpeciesTypeInstance(const SpeciesTypeInstance* sti)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != sti->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const SBase *>(sti)) == false)
   {
     return LIBSBML_NAMESPACES_MISMATCH;
@@ -728,10 +720,6 @@ MultiSpeciesType::addSpeciesTypeComponentIndex(const SpeciesTypeComponentIndex*
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != stci->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const SBase *>(stci)) == false)
   {
     return LIBSBML_NAMESPACES_MISMATCH;
@@ -885,10 +873,6 @@ MultiSpeciesType::addInSpeciesTypeBond(const InSpeciesTypeBond* istb)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != istb->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const SBase *>(istb)) == false)
   {
     return LIBSBML_NAMESPACES_MISMATCH;
diff --git a/src/sbml/packages/multi/sbml/SpeciesFeature.cpp b/src/sbml/packages/multi/sbml/SpeciesFeature.cpp
index a6340152f1..0ddaad59e2 100644
--- a/src/sbml/packages/multi/sbml/SpeciesFeature.cpp
+++ b/src/sbml/packages/multi/sbml/SpeciesFeature.cpp
@@ -509,10 +509,6 @@ SpeciesFeature::addSpeciesFeatureValue(const SpeciesFeatureValue* sfv)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != sfv->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const SBase *>(sfv)) == false)
   {
     return LIBSBML_NAMESPACES_MISMATCH;
diff --git a/src/sbml/packages/multi/sbml/SpeciesFeatureType.cpp b/src/sbml/packages/multi/sbml/SpeciesFeatureType.cpp
index 908ae27b96..4ff8b6080a 100644
--- a/src/sbml/packages/multi/sbml/SpeciesFeatureType.cpp
+++ b/src/sbml/packages/multi/sbml/SpeciesFeatureType.cpp
@@ -392,10 +392,6 @@ SpeciesFeatureType::addPossibleSpeciesFeatureValue(const PossibleSpeciesFeatureV
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != psfv->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const SBase *>(psfv)) == false)
   {
     return LIBSBML_NAMESPACES_MISMATCH;
diff --git a/src/sbml/packages/qual/extension/QualModelPlugin.cpp b/src/sbml/packages/qual/extension/QualModelPlugin.cpp
index 4af27bd428..103b53bd2f 100644
--- a/src/sbml/packages/qual/extension/QualModelPlugin.cpp
+++ b/src/sbml/packages/qual/extension/QualModelPlugin.cpp
@@ -808,10 +808,6 @@ QualModelPlugin::addQualitativeSpecies (const QualitativeSpecies* qual)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != qual->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (getPackageVersion() != qual->getPackageVersion())
   {
     return LIBSBML_PKG_VERSION_MISMATCH;
@@ -990,10 +986,6 @@ QualModelPlugin::addTransition (const Transition* qual)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != qual->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (getPackageVersion() != qual->getPackageVersion())
   {
     return LIBSBML_PKG_VERSION_MISMATCH;
diff --git a/src/sbml/packages/qual/sbml/FunctionTerm.cpp b/src/sbml/packages/qual/sbml/FunctionTerm.cpp
index bbf6a27827..a446439e02 100644
--- a/src/sbml/packages/qual/sbml/FunctionTerm.cpp
+++ b/src/sbml/packages/qual/sbml/FunctionTerm.cpp
@@ -1046,10 +1046,6 @@ ListOfFunctionTerms::setDefaultTerm(const DefaultTerm* dt)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != dt->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else
   {
     delete mDefaultTerm;
diff --git a/src/sbml/packages/qual/sbml/Transition.cpp b/src/sbml/packages/qual/sbml/Transition.cpp
index b447c279ea..7b7240e8f8 100644
--- a/src/sbml/packages/qual/sbml/Transition.cpp
+++ b/src/sbml/packages/qual/sbml/Transition.cpp
@@ -413,10 +413,6 @@ Transition::addInput(const Input* i)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != i->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const SBase *>(i)) == false)
   {
     return LIBSBML_NAMESPACES_MISMATCH;
@@ -597,10 +593,6 @@ Transition::addOutput(const Output* i)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != i->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const SBase *>(i)) == false)
   {
     return LIBSBML_NAMESPACES_MISMATCH;
@@ -761,10 +753,6 @@ Transition::addFunctionTerm(const FunctionTerm* i)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != i->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const SBase *>(i)) == false)
   {
     return LIBSBML_NAMESPACES_MISMATCH;
@@ -841,10 +829,6 @@ Transition::setDefaultTerm(const DefaultTerm* i)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != i->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const SBase *>(i)) == false)
   {
     return LIBSBML_NAMESPACES_MISMATCH;
diff --git a/src/sbml/packages/render/sbml/GlobalRenderInformation.cpp b/src/sbml/packages/render/sbml/GlobalRenderInformation.cpp
index 6df831a51b..b36ee7f9c1 100644
--- a/src/sbml/packages/render/sbml/GlobalRenderInformation.cpp
+++ b/src/sbml/packages/render/sbml/GlobalRenderInformation.cpp
@@ -309,10 +309,6 @@ GlobalRenderInformation::addGlobalStyle(const GlobalStyle* gs)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != gs->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(gs)) == false)
   {
diff --git a/src/sbml/packages/render/sbml/GradientBase.cpp b/src/sbml/packages/render/sbml/GradientBase.cpp
index 6b641ee94c..e16e41423f 100644
--- a/src/sbml/packages/render/sbml/GradientBase.cpp
+++ b/src/sbml/packages/render/sbml/GradientBase.cpp
@@ -529,10 +529,6 @@ GradientBase::addGradientStop(const GradientStop* gs)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != gs->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(gs)) == false)
   {
diff --git a/src/sbml/packages/render/sbml/ListOfColorDefinitions.cpp b/src/sbml/packages/render/sbml/ListOfColorDefinitions.cpp
index f0b4816510..c2b25beab1 100644
--- a/src/sbml/packages/render/sbml/ListOfColorDefinitions.cpp
+++ b/src/sbml/packages/render/sbml/ListOfColorDefinitions.cpp
@@ -259,10 +259,6 @@ ListOfColorDefinitions::addColorDefinition(const ColorDefinition* cd)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != cd->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(cd)) == false)
   {
diff --git a/src/sbml/packages/render/sbml/ListOfCurveElements.cpp b/src/sbml/packages/render/sbml/ListOfCurveElements.cpp
index 2d3a776604..e0dcbcf308 100644
--- a/src/sbml/packages/render/sbml/ListOfCurveElements.cpp
+++ b/src/sbml/packages/render/sbml/ListOfCurveElements.cpp
@@ -288,10 +288,6 @@ ListOfCurveElements::addRenderPoint(const RenderPoint* rp)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != rp->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(rp)) == false)
   {
diff --git a/src/sbml/packages/render/sbml/ListOfDrawables.cpp b/src/sbml/packages/render/sbml/ListOfDrawables.cpp
index 2e69cab01b..b7c0a46677 100644
--- a/src/sbml/packages/render/sbml/ListOfDrawables.cpp
+++ b/src/sbml/packages/render/sbml/ListOfDrawables.cpp
@@ -225,10 +225,6 @@ ListOfDrawables::addTransformation2D(const Transformation2D* td)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != td->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(td)) == false)
   {
diff --git a/src/sbml/packages/render/sbml/ListOfGlobalRenderInformation.cpp b/src/sbml/packages/render/sbml/ListOfGlobalRenderInformation.cpp
index 2686b59b5a..5e7a877ea0 100644
--- a/src/sbml/packages/render/sbml/ListOfGlobalRenderInformation.cpp
+++ b/src/sbml/packages/render/sbml/ListOfGlobalRenderInformation.cpp
@@ -567,10 +567,6 @@ ListOfGlobalRenderInformation::addGlobalRenderInformation(const
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != gri->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(gri)) == false)
   {
diff --git a/src/sbml/packages/render/sbml/ListOfGlobalStyles.cpp b/src/sbml/packages/render/sbml/ListOfGlobalStyles.cpp
index 9d453d9a95..f67bf9e5ed 100644
--- a/src/sbml/packages/render/sbml/ListOfGlobalStyles.cpp
+++ b/src/sbml/packages/render/sbml/ListOfGlobalStyles.cpp
@@ -247,10 +247,6 @@ ListOfGlobalStyles::addGlobalStyle(const GlobalStyle* gs)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != gs->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(gs)) == false)
   {
diff --git a/src/sbml/packages/render/sbml/ListOfGradientDefinitions.cpp b/src/sbml/packages/render/sbml/ListOfGradientDefinitions.cpp
index 7707edd6a4..d09bae4ccd 100644
--- a/src/sbml/packages/render/sbml/ListOfGradientDefinitions.cpp
+++ b/src/sbml/packages/render/sbml/ListOfGradientDefinitions.cpp
@@ -269,10 +269,6 @@ ListOfGradientDefinitions::addGradientBase(const GradientBase* gb)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != gb->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(gb)) == false)
   {
diff --git a/src/sbml/packages/render/sbml/ListOfGradientStops.cpp b/src/sbml/packages/render/sbml/ListOfGradientStops.cpp
index ce3d20f47d..9a0f14d0c0 100644
--- a/src/sbml/packages/render/sbml/ListOfGradientStops.cpp
+++ b/src/sbml/packages/render/sbml/ListOfGradientStops.cpp
@@ -268,10 +268,6 @@ ListOfGradientStops::addGradientStop(const GradientStop* gs)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != gs->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(gs)) == false)
   {
diff --git a/src/sbml/packages/render/sbml/ListOfLineEndings.cpp b/src/sbml/packages/render/sbml/ListOfLineEndings.cpp
index 2586d4887d..8f0ac40a8a 100644
--- a/src/sbml/packages/render/sbml/ListOfLineEndings.cpp
+++ b/src/sbml/packages/render/sbml/ListOfLineEndings.cpp
@@ -259,10 +259,6 @@ ListOfLineEndings::addLineEnding(const LineEnding* le)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != le->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(le)) == false)
   {
diff --git a/src/sbml/packages/render/sbml/ListOfLocalRenderInformation.cpp b/src/sbml/packages/render/sbml/ListOfLocalRenderInformation.cpp
index 6e96f479d6..07e18eda21 100644
--- a/src/sbml/packages/render/sbml/ListOfLocalRenderInformation.cpp
+++ b/src/sbml/packages/render/sbml/ListOfLocalRenderInformation.cpp
@@ -548,10 +548,6 @@ ListOfLocalRenderInformation::addLocalRenderInformation(const
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != lri->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(lri)) == false)
   {
diff --git a/src/sbml/packages/render/sbml/ListOfLocalStyles.cpp b/src/sbml/packages/render/sbml/ListOfLocalStyles.cpp
index 0972a34e87..2a9db6aa4f 100644
--- a/src/sbml/packages/render/sbml/ListOfLocalStyles.cpp
+++ b/src/sbml/packages/render/sbml/ListOfLocalStyles.cpp
@@ -263,10 +263,6 @@ ListOfLocalStyles::addLocalStyle(const LocalStyle* ls)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != ls->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(ls)) == false)
   {
diff --git a/src/sbml/packages/render/sbml/LocalRenderInformation.cpp b/src/sbml/packages/render/sbml/LocalRenderInformation.cpp
index 1f97b83ee8..bb94475e8d 100644
--- a/src/sbml/packages/render/sbml/LocalRenderInformation.cpp
+++ b/src/sbml/packages/render/sbml/LocalRenderInformation.cpp
@@ -290,10 +290,6 @@ LocalRenderInformation::addLocalStyle(const LocalStyle* ls)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != ls->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(ls)) == false)
   {
diff --git a/src/sbml/packages/render/sbml/Polygon.cpp b/src/sbml/packages/render/sbml/Polygon.cpp
index 8cec448980..35fbfd33f0 100644
--- a/src/sbml/packages/render/sbml/Polygon.cpp
+++ b/src/sbml/packages/render/sbml/Polygon.cpp
@@ -385,10 +385,6 @@ Polygon::addElement(const RenderPoint* rp)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != rp->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(rp)) == false)
   {
diff --git a/src/sbml/packages/render/sbml/RenderCurve.cpp b/src/sbml/packages/render/sbml/RenderCurve.cpp
index 85aaf698a3..531439bbce 100644
--- a/src/sbml/packages/render/sbml/RenderCurve.cpp
+++ b/src/sbml/packages/render/sbml/RenderCurve.cpp
@@ -437,10 +437,6 @@ RenderCurve::addElement(const RenderPoint* rp)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != rp->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(rp)) == false)
   {
diff --git a/src/sbml/packages/render/sbml/RenderGroup.cpp b/src/sbml/packages/render/sbml/RenderGroup.cpp
index 883ebf7854..0c38c30635 100644
--- a/src/sbml/packages/render/sbml/RenderGroup.cpp
+++ b/src/sbml/packages/render/sbml/RenderGroup.cpp
@@ -1044,10 +1044,6 @@ RenderGroup::addElement(const Transformation2D* td)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != td->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(td)) == false)
   {
@@ -1078,10 +1074,6 @@ RenderGroup::addChildElement(const Transformation2D* td)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != td->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(td)) == false)
   {
diff --git a/src/sbml/packages/render/sbml/RenderInformationBase.cpp b/src/sbml/packages/render/sbml/RenderInformationBase.cpp
index 91e6c51666..90b5f96410 100644
--- a/src/sbml/packages/render/sbml/RenderInformationBase.cpp
+++ b/src/sbml/packages/render/sbml/RenderInformationBase.cpp
@@ -694,10 +694,6 @@ RenderInformationBase::addColorDefinition(const ColorDefinition* cd)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != cd->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(cd)) == false)
   {
@@ -856,10 +852,6 @@ RenderInformationBase::addGradientDefinition(const GradientBase* gb)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != gb->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(gb)) == false)
   {
@@ -1046,10 +1038,6 @@ RenderInformationBase::addLineEnding(const LineEnding* le)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != le->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(le)) == false)
   {
diff --git a/src/sbml/packages/spatial/extension/SpatialCompartmentPlugin.cpp b/src/sbml/packages/spatial/extension/SpatialCompartmentPlugin.cpp
index e4eb0369a9..4ee60db091 100644
--- a/src/sbml/packages/spatial/extension/SpatialCompartmentPlugin.cpp
+++ b/src/sbml/packages/spatial/extension/SpatialCompartmentPlugin.cpp
@@ -189,10 +189,6 @@ SpatialCompartmentPlugin::setCompartmentMapping(const CompartmentMapping*
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != compartmentMapping->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (getPackageVersion() != compartmentMapping->getPackageVersion())
   {
     return LIBSBML_PKG_VERSION_MISMATCH;
diff --git a/src/sbml/packages/spatial/extension/SpatialModelPlugin.cpp b/src/sbml/packages/spatial/extension/SpatialModelPlugin.cpp
index c151b3f3b5..757fe1b3ba 100644
--- a/src/sbml/packages/spatial/extension/SpatialModelPlugin.cpp
+++ b/src/sbml/packages/spatial/extension/SpatialModelPlugin.cpp
@@ -181,10 +181,6 @@ SpatialModelPlugin::setGeometry(const Geometry* geometry)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != geometry->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (getPackageVersion() != geometry->getPackageVersion())
   {
     return LIBSBML_PKG_VERSION_MISMATCH;
diff --git a/src/sbml/packages/spatial/extension/SpatialParameterPlugin.cpp b/src/sbml/packages/spatial/extension/SpatialParameterPlugin.cpp
index d8fc1252f0..3425880f77 100644
--- a/src/sbml/packages/spatial/extension/SpatialParameterPlugin.cpp
+++ b/src/sbml/packages/spatial/extension/SpatialParameterPlugin.cpp
@@ -343,10 +343,6 @@ SpatialParameterPlugin::setSpatialSymbolReference(const SpatialSymbolReference*
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != spatialSymbolReference->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (getPackageVersion() != spatialSymbolReference->getPackageVersion())
   {
     return LIBSBML_PKG_VERSION_MISMATCH;
@@ -382,10 +378,6 @@ SpatialParameterPlugin::setAdvectionCoefficient(const AdvectionCoefficient*
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != advectionCoefficient->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (getPackageVersion() != advectionCoefficient->getPackageVersion())
   {
     return LIBSBML_PKG_VERSION_MISMATCH;
@@ -421,10 +413,6 @@ SpatialParameterPlugin::setBoundaryCondition(const BoundaryCondition*
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != boundaryCondition->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (getPackageVersion() != boundaryCondition->getPackageVersion())
   {
     return LIBSBML_PKG_VERSION_MISMATCH;
@@ -460,10 +448,6 @@ SpatialParameterPlugin::setDiffusionCoefficient(const DiffusionCoefficient*
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != diffusionCoefficient->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (getPackageVersion() != diffusionCoefficient->getPackageVersion())
   {
     return LIBSBML_PKG_VERSION_MISMATCH;
diff --git a/src/sbml/packages/spatial/sbml/AnalyticGeometry.cpp b/src/sbml/packages/spatial/sbml/AnalyticGeometry.cpp
index e7de915aa8..a11ecf7dfe 100644
--- a/src/sbml/packages/spatial/sbml/AnalyticGeometry.cpp
+++ b/src/sbml/packages/spatial/sbml/AnalyticGeometry.cpp
@@ -235,10 +235,6 @@ AnalyticGeometry::addAnalyticVolume(const AnalyticVolume* av)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != av->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(av)) == false)
   {
diff --git a/src/sbml/packages/spatial/sbml/CSGSetOperator.cpp b/src/sbml/packages/spatial/sbml/CSGSetOperator.cpp
index 80f531e64d..ad78d24380 100644
--- a/src/sbml/packages/spatial/sbml/CSGSetOperator.cpp
+++ b/src/sbml/packages/spatial/sbml/CSGSetOperator.cpp
@@ -422,10 +422,6 @@ CSGSetOperator::addCSGNode(const CSGNode* csgn)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != csgn->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(csgn)) == false)
   {
diff --git a/src/sbml/packages/spatial/sbml/CSGeometry.cpp b/src/sbml/packages/spatial/sbml/CSGeometry.cpp
index 52b79bc49d..6de3a0fe47 100644
--- a/src/sbml/packages/spatial/sbml/CSGeometry.cpp
+++ b/src/sbml/packages/spatial/sbml/CSGeometry.cpp
@@ -235,10 +235,6 @@ CSGeometry::addCSGObject(const CSGObject* csgo)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != csgo->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(csgo)) == false)
   {
diff --git a/src/sbml/packages/spatial/sbml/Domain.cpp b/src/sbml/packages/spatial/sbml/Domain.cpp
index dc1d92dbcb..20867be2c9 100644
--- a/src/sbml/packages/spatial/sbml/Domain.cpp
+++ b/src/sbml/packages/spatial/sbml/Domain.cpp
@@ -350,10 +350,6 @@ Domain::addInteriorPoint(const InteriorPoint* ip)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != ip->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(ip)) == false)
   {
diff --git a/src/sbml/packages/spatial/sbml/Geometry.cpp b/src/sbml/packages/spatial/sbml/Geometry.cpp
index ddac477429..3a4104f5a2 100644
--- a/src/sbml/packages/spatial/sbml/Geometry.cpp
+++ b/src/sbml/packages/spatial/sbml/Geometry.cpp
@@ -371,10 +371,6 @@ Geometry::addCoordinateComponent(const CoordinateComponent* cc)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != cc->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(cc)) == false)
   {
@@ -529,10 +525,6 @@ Geometry::addDomainType(const DomainType* dt)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != dt->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(dt)) == false)
   {
@@ -710,10 +702,6 @@ Geometry::addDomain(const Domain* d)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != d->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(d)) == false)
   {
@@ -911,10 +899,6 @@ Geometry::addAdjacentDomains(const AdjacentDomains* ad)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != ad->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(ad)) == false)
   {
@@ -1070,10 +1054,6 @@ Geometry::addGeometryDefinition(const GeometryDefinition* gd)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != gd->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(gd)) == false)
   {
@@ -1340,10 +1320,6 @@ Geometry::addSampledField(const SampledField* sf)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != sf->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(sf)) == false)
   {
diff --git a/src/sbml/packages/spatial/sbml/ListOfAdjacentDomains.cpp b/src/sbml/packages/spatial/sbml/ListOfAdjacentDomains.cpp
index a268ce5582..53a80c04bd 100644
--- a/src/sbml/packages/spatial/sbml/ListOfAdjacentDomains.cpp
+++ b/src/sbml/packages/spatial/sbml/ListOfAdjacentDomains.cpp
@@ -219,10 +219,6 @@ ListOfAdjacentDomains::addAdjacentDomains(const AdjacentDomains* ad)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != ad->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(ad)) == false)
   {
diff --git a/src/sbml/packages/spatial/sbml/ListOfAnalyticVolumes.cpp b/src/sbml/packages/spatial/sbml/ListOfAnalyticVolumes.cpp
index ecd0603a74..3c552809e7 100644
--- a/src/sbml/packages/spatial/sbml/ListOfAnalyticVolumes.cpp
+++ b/src/sbml/packages/spatial/sbml/ListOfAnalyticVolumes.cpp
@@ -224,10 +224,6 @@ ListOfAnalyticVolumes::addAnalyticVolume(const AnalyticVolume* av)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != av->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(av)) == false)
   {
diff --git a/src/sbml/packages/spatial/sbml/ListOfCSGNodes.cpp b/src/sbml/packages/spatial/sbml/ListOfCSGNodes.cpp
index 0416fea5dd..5d989caf94 100644
--- a/src/sbml/packages/spatial/sbml/ListOfCSGNodes.cpp
+++ b/src/sbml/packages/spatial/sbml/ListOfCSGNodes.cpp
@@ -226,10 +226,6 @@ ListOfCSGNodes::addCSGNode(const CSGNode* csgn)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != csgn->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(csgn)) == false)
   {
diff --git a/src/sbml/packages/spatial/sbml/ListOfCSGObjects.cpp b/src/sbml/packages/spatial/sbml/ListOfCSGObjects.cpp
index 3b1dc5244a..e6e08e4c72 100644
--- a/src/sbml/packages/spatial/sbml/ListOfCSGObjects.cpp
+++ b/src/sbml/packages/spatial/sbml/ListOfCSGObjects.cpp
@@ -220,10 +220,6 @@ ListOfCSGObjects::addCSGObject(const CSGObject* csgo)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != csgo->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(csgo)) == false)
   {
diff --git a/src/sbml/packages/spatial/sbml/ListOfCoordinateComponents.cpp b/src/sbml/packages/spatial/sbml/ListOfCoordinateComponents.cpp
index a9c1e295e8..45eb9514a6 100644
--- a/src/sbml/packages/spatial/sbml/ListOfCoordinateComponents.cpp
+++ b/src/sbml/packages/spatial/sbml/ListOfCoordinateComponents.cpp
@@ -229,10 +229,6 @@ ListOfCoordinateComponents::addCoordinateComponent(const CoordinateComponent*
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != cc->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(cc)) == false)
   {
diff --git a/src/sbml/packages/spatial/sbml/ListOfDomainTypes.cpp b/src/sbml/packages/spatial/sbml/ListOfDomainTypes.cpp
index 0fd1b1bd08..2b8f19a4f5 100644
--- a/src/sbml/packages/spatial/sbml/ListOfDomainTypes.cpp
+++ b/src/sbml/packages/spatial/sbml/ListOfDomainTypes.cpp
@@ -216,10 +216,6 @@ ListOfDomainTypes::addDomainType(const DomainType* dt)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != dt->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(dt)) == false)
   {
diff --git a/src/sbml/packages/spatial/sbml/ListOfDomains.cpp b/src/sbml/packages/spatial/sbml/ListOfDomains.cpp
index 7ee6c5a630..35d44e680b 100644
--- a/src/sbml/packages/spatial/sbml/ListOfDomains.cpp
+++ b/src/sbml/packages/spatial/sbml/ListOfDomains.cpp
@@ -218,10 +218,6 @@ ListOfDomains::addDomain(const Domain* d)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != d->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(d)) == false)
   {
diff --git a/src/sbml/packages/spatial/sbml/ListOfGeometryDefinitions.cpp b/src/sbml/packages/spatial/sbml/ListOfGeometryDefinitions.cpp
index ba18c436d3..3f755f123f 100644
--- a/src/sbml/packages/spatial/sbml/ListOfGeometryDefinitions.cpp
+++ b/src/sbml/packages/spatial/sbml/ListOfGeometryDefinitions.cpp
@@ -234,10 +234,6 @@ ListOfGeometryDefinitions::addGeometryDefinition(const GeometryDefinition* gd)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != gd->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(gd)) == false)
   {
diff --git a/src/sbml/packages/spatial/sbml/ListOfInteriorPoints.cpp b/src/sbml/packages/spatial/sbml/ListOfInteriorPoints.cpp
index b49f1f00ea..783f586546 100644
--- a/src/sbml/packages/spatial/sbml/ListOfInteriorPoints.cpp
+++ b/src/sbml/packages/spatial/sbml/ListOfInteriorPoints.cpp
@@ -217,10 +217,6 @@ ListOfInteriorPoints::addInteriorPoint(const InteriorPoint* ip)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != ip->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(ip)) == false)
   {
diff --git a/src/sbml/packages/spatial/sbml/ListOfOrdinalMappings.cpp b/src/sbml/packages/spatial/sbml/ListOfOrdinalMappings.cpp
index 986e60091e..04eee60b9c 100644
--- a/src/sbml/packages/spatial/sbml/ListOfOrdinalMappings.cpp
+++ b/src/sbml/packages/spatial/sbml/ListOfOrdinalMappings.cpp
@@ -219,10 +219,6 @@ ListOfOrdinalMappings::addOrdinalMapping(const OrdinalMapping* om)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != om->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(om)) == false)
   {
diff --git a/src/sbml/packages/spatial/sbml/ListOfParametricObjects.cpp b/src/sbml/packages/spatial/sbml/ListOfParametricObjects.cpp
index d8a7397750..d734b7ff2b 100644
--- a/src/sbml/packages/spatial/sbml/ListOfParametricObjects.cpp
+++ b/src/sbml/packages/spatial/sbml/ListOfParametricObjects.cpp
@@ -221,10 +221,6 @@ ListOfParametricObjects::addParametricObject(const ParametricObject* po)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != po->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(po)) == false)
   {
diff --git a/src/sbml/packages/spatial/sbml/ListOfSampledFields.cpp b/src/sbml/packages/spatial/sbml/ListOfSampledFields.cpp
index ae3b75dc69..db4644d7ae 100644
--- a/src/sbml/packages/spatial/sbml/ListOfSampledFields.cpp
+++ b/src/sbml/packages/spatial/sbml/ListOfSampledFields.cpp
@@ -217,10 +217,6 @@ ListOfSampledFields::addSampledField(const SampledField* sf)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != sf->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(sf)) == false)
   {
diff --git a/src/sbml/packages/spatial/sbml/ListOfSampledVolumes.cpp b/src/sbml/packages/spatial/sbml/ListOfSampledVolumes.cpp
index bd12c384a2..0cab3d0789 100644
--- a/src/sbml/packages/spatial/sbml/ListOfSampledVolumes.cpp
+++ b/src/sbml/packages/spatial/sbml/ListOfSampledVolumes.cpp
@@ -217,10 +217,6 @@ ListOfSampledVolumes::addSampledVolume(const SampledVolume* sv)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != sv->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(sv)) == false)
   {
diff --git a/src/sbml/packages/spatial/sbml/MixedGeometry.cpp b/src/sbml/packages/spatial/sbml/MixedGeometry.cpp
index 5c9b356ca2..bce5786794 100644
--- a/src/sbml/packages/spatial/sbml/MixedGeometry.cpp
+++ b/src/sbml/packages/spatial/sbml/MixedGeometry.cpp
@@ -219,10 +219,6 @@ MixedGeometry::addGeometryDefinition(const GeometryDefinition* gd)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != gd->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(gd)) == false)
   {
@@ -492,10 +488,6 @@ MixedGeometry::addOrdinalMapping(const OrdinalMapping* om)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != om->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(om)) == false)
   {
diff --git a/src/sbml/packages/spatial/sbml/ParametricGeometry.cpp b/src/sbml/packages/spatial/sbml/ParametricGeometry.cpp
index b371a9aa52..34dc4b7538 100644
--- a/src/sbml/packages/spatial/sbml/ParametricGeometry.cpp
+++ b/src/sbml/packages/spatial/sbml/ParametricGeometry.cpp
@@ -349,10 +349,6 @@ ParametricGeometry::addParametricObject(const ParametricObject* po)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != po->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(po)) == false)
   {
diff --git a/src/sbml/packages/spatial/sbml/SampledFieldGeometry.cpp b/src/sbml/packages/spatial/sbml/SampledFieldGeometry.cpp
index 6301f1bd4e..fb116f3032 100644
--- a/src/sbml/packages/spatial/sbml/SampledFieldGeometry.cpp
+++ b/src/sbml/packages/spatial/sbml/SampledFieldGeometry.cpp
@@ -297,10 +297,6 @@ SampledFieldGeometry::addSampledVolume(const SampledVolume* sv)
   {
     return LIBSBML_LEVEL_MISMATCH;
   }
-  else if (getVersion() != sv->getVersion())
-  {
-    return LIBSBML_VERSION_MISMATCH;
-  }
   else if (matchesRequiredSBMLNamespacesForAddition(static_cast<const
     SBase*>(sv)) == false)
   {