diff --git a/examplelibs/open-dis7-entities-usa-surface.jar b/examplelibs/open-dis7-entities-usa-surface.jar
deleted file mode 100644
index 2a13d68b91b4e23e97568e7cf6a27dc6800a8c30..0000000000000000000000000000000000000000
Binary files a/examplelibs/open-dis7-entities-usa-surface.jar and /dev/null differ
diff --git a/nbproject/project.properties b/nbproject/project.properties
index 9b25dec28198593aae46337879a87cfe87ed3532..3e87f34fe24b059faa222e07fe09c5569241a51b 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -37,13 +37,13 @@ endorsed.classpath=
 excludes=
 file.reference.commons-io-2.6.jar=optionallibs/commons-io-2.6.jar
 file.reference.guava-28.0-jre.jar=optionallibs/guava-28.0-jre.jar
-file.reference.open-dis7-entities-usa-surface.jar=examplelibs/open-dis7-entities-usa-surface.jar
+file.reference.open-dis7-entities-usa-surface.jar=releasejars/open-dis7-entities-usa-surface.jar
 includes=**
 jar.compress=false
 javac.classpath=\
-    ${file.reference.open-dis7-entities-usa-surface.jar}:\
     ${file.reference.guava-28.0-jre.jar}:\
-    ${file.reference.commons-io-2.6.jar}
+    ${file.reference.commons-io-2.6.jar}:\
+    ${file.reference.open-dis7-entities-usa-surface.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
diff --git a/releasejars/open-dis7-entities-all.jar b/releasejars/open-dis7-entities-all.jar
index cb938edd8c4f94832679c7dcb2a3e7325e2dd917..14688821875525c998a41190afd4c43044ff454a 100644
Binary files a/releasejars/open-dis7-entities-all.jar and b/releasejars/open-dis7-entities-all.jar differ
diff --git a/releasejars/open-dis7-entities-chn.jar b/releasejars/open-dis7-entities-chn.jar
index 97568ea66870e0b7e182c3e4df3a719a2a9e83bd..704935cb08c7a87a5fc14db0116ae7a0ccf06d8a 100644
Binary files a/releasejars/open-dis7-entities-chn.jar and b/releasejars/open-dis7-entities-chn.jar differ
diff --git a/releasejars/open-dis7-entities-deu.jar b/releasejars/open-dis7-entities-deu.jar
index 644c13984b10815326c0b7a69ec6b54a156817e0..f4f79c8ae3d04eaec8705da2ded9f48df87ceb77 100644
Binary files a/releasejars/open-dis7-entities-deu.jar and b/releasejars/open-dis7-entities-deu.jar differ
diff --git a/releasejars/open-dis7-entities-nato.jar b/releasejars/open-dis7-entities-nato.jar
index 61d629db1f0d5447c8faff6fc00cb519656deaff..ddb3cdece4f47a139bd0c0ee7671450473221066 100644
Binary files a/releasejars/open-dis7-entities-nato.jar and b/releasejars/open-dis7-entities-nato.jar differ
diff --git a/releasejars/open-dis7-entities-rus.jar b/releasejars/open-dis7-entities-rus.jar
index 4a9bd8cf3d348649cbda5aa4a67b24a7084aadd0..d1b0648638b0edf280fb32d571e2f641ec7f7186 100644
Binary files a/releasejars/open-dis7-entities-rus.jar and b/releasejars/open-dis7-entities-rus.jar differ
diff --git a/releasejars/open-dis7-entities-usa-air.jar b/releasejars/open-dis7-entities-usa-air.jar
index 1fd922ebd14017828934e04b7c1fd888f37f36c0..a3a15e86984924838e394f8b281ea83c5c7e4e1c 100644
Binary files a/releasejars/open-dis7-entities-usa-air.jar and b/releasejars/open-dis7-entities-usa-air.jar differ
diff --git a/releasejars/open-dis7-entities-usa-all.jar b/releasejars/open-dis7-entities-usa-all.jar
index 5d6d2921edce465820dc89d69c4bbdfb2b9791b9..cbaa9009a161cc1d5c2ce0dac0864a5874643e13 100644
Binary files a/releasejars/open-dis7-entities-usa-all.jar and b/releasejars/open-dis7-entities-usa-all.jar differ
diff --git a/releasejars/open-dis7-entities-usa-land.jar b/releasejars/open-dis7-entities-usa-land.jar
index 15c9ffad7f2276af1d32d4104e3a4360b711580b..2f1a02aea03adf6249a16c38d0f016cb03f3667e 100644
Binary files a/releasejars/open-dis7-entities-usa-land.jar and b/releasejars/open-dis7-entities-usa-land.jar differ
diff --git a/releasejars/open-dis7-entities-usa-munitions.jar b/releasejars/open-dis7-entities-usa-munitions.jar
index c9327b533916a326716911569ce37dade5ed3e73..c3f4996f35f008e500490b104814c0a9cb60c3ff 100644
Binary files a/releasejars/open-dis7-entities-usa-munitions.jar and b/releasejars/open-dis7-entities-usa-munitions.jar differ
diff --git a/releasejars/open-dis7-entities-usa-surface.jar b/releasejars/open-dis7-entities-usa-surface.jar
index 5b8ed7c60a238e279bbb3680becac5822ef2bb56..946f4f3f4bf6c5d1f805c5d5a5384dfa8d8bbf62 100644
Binary files a/releasejars/open-dis7-entities-usa-surface.jar and b/releasejars/open-dis7-entities-usa-surface.jar differ
diff --git a/releasejars/open-dis7.jar b/releasejars/open-dis7.jar
index 7f42cf195cbde51a63435c2c5711632ad2f2faf2..d1437a8995bbfa91afcc59259b3778c69488f35a 100644
Binary files a/releasejars/open-dis7.jar and b/releasejars/open-dis7.jar differ
diff --git a/src-generated/edu/nps/moves/dis/Domain.java b/src-generated/edu/nps/moves/dis/Domain.java
index 80e068c0a559d636cf2c53bf69fc636e595fe7b9..59762cb7dd6c0ec6529619ceac164055893fc9ed 100644
--- a/src-generated/edu/nps/moves/dis/Domain.java
+++ b/src-generated/edu/nps/moves/dis/Domain.java
@@ -9,6 +9,7 @@ import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.lang.reflect.Method;
 import java.nio.ByteBuffer;
+import java.lang.reflect.InvocationTargetException;
 
 import edu.nps.moves.dis.enumerations.*;
 
@@ -111,11 +112,12 @@ public class Domain
     try {
       return m.invoke(enumInst, oa);
     }
-    catch (Exception ex) {
+    catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException ex) {
       throw new RuntimeException("bad " + m.getName());
     }
   }
 
+  @Override
   public String toString()
   {
     return getDescription();
diff --git a/src/edu/nps/moves/dis/Extra.java b/src/edu/nps/moves/dis/Extra.java
deleted file mode 100644
index 5c00c1e516f3042d1729325e671e192dc6ff3823..0000000000000000000000000000000000000000
--- a/src/edu/nps/moves/dis/Extra.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
- * This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
- */
-
-package edu.nps.moves.dis;
-
-/**
- * Extra.java created on May 7, 2019
- * Marker interface to polymorphize extra field in Pdus
- */
-public interface Extra
-{
-}
diff --git a/src/edu/nps/moves/dis/JammerCategory.java b/src/edu/nps/moves/dis/JammerCategory.java
deleted file mode 100644
index ae7bbe49f63a266f9c22f39853dc56c1b8fcd4e1..0000000000000000000000000000000000000000
--- a/src/edu/nps/moves/dis/JammerCategory.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
- * This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
- */
-
-package edu.nps.moves.dis;
-
-/**
- * JammerCategory.java created on May 7, 2019
- * Marker interface to polymorphize category field in JammerTechnique
- */
-public interface JammerCategory extends Marshaller
-{
-}
diff --git a/src/edu/nps/moves/dis/JammerExtra.java b/src/edu/nps/moves/dis/JammerExtra.java
deleted file mode 100644
index 9ea1a5f72893f653e6f1447d85a606424e680471..0000000000000000000000000000000000000000
--- a/src/edu/nps/moves/dis/JammerExtra.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
- * This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
- */
-
-package edu.nps.moves.dis;
-
-/**
- * JammerExtra.java created on May 7, 2019
- * Marker interface to polymorphize extra field in JammerTechnique
- */
-public interface JammerExtra extends Marshaller
-{
-}
diff --git a/src/edu/nps/moves/dis/JammerKind.java b/src/edu/nps/moves/dis/JammerKind.java
deleted file mode 100644
index 2349296827657c2581ba21d7ade47ebc37cda225..0000000000000000000000000000000000000000
--- a/src/edu/nps/moves/dis/JammerKind.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
- * This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
- */
-
-package edu.nps.moves.dis;
-
-/**
- * JammerKind.java created on May 7, 2019
- * Marker interface to polymorphize kind field in JammerTechnique
- */
-public interface JammerKind extends Marshaller
-{
-}
diff --git a/src/edu/nps/moves/dis/JammerSpecific.java b/src/edu/nps/moves/dis/JammerSpecific.java
deleted file mode 100644
index 8b1bf3bdba1ab2924097d926bc7104c2b47aebde..0000000000000000000000000000000000000000
--- a/src/edu/nps/moves/dis/JammerSpecific.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
- * This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
- */
-
-package edu.nps.moves.dis;
-
-/**
- * JammerSpecific.java created on May 7, 2019
- * Marker interface to polymorphize specific field in JammerTechnique
- */
-public interface JammerSpecific extends Marshaller
-{
-}
diff --git a/src/edu/nps/moves/dis/JammerSubCategory.java b/src/edu/nps/moves/dis/JammerSubCategory.java
deleted file mode 100644
index a3d0c2ab22c31945c660f5ed4a77c8ca8a1a0813..0000000000000000000000000000000000000000
--- a/src/edu/nps/moves/dis/JammerSubCategory.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
- * This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
- */
-
-package edu.nps.moves.dis;
-
-/**
- * JammerSubCategory.java created on May 7, 2019
- * Marker interface to polymorphize subcategory field in JammerTechnique
- */
-public interface JammerSubCategory extends Marshaller
-{
-}
diff --git a/src/edu/nps/moves/dis/Specific.java b/src/edu/nps/moves/dis/Specific.java
deleted file mode 100644
index 77f53586b6884199df4fe2ddca9d283c7bcee0d5..0000000000000000000000000000000000000000
--- a/src/edu/nps/moves/dis/Specific.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
- * This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
- */
-
-package edu.nps.moves.dis;
-
-public interface Specific
-{
-}