diff --git a/edexOsgi/com.raytheon.edex.plugin.bufrmos/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject b/edexOsgi/com.raytheon.edex.plugin.bufrmos/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
deleted file mode 100644
index e86e30db95..0000000000
--- a/edexOsgi/com.raytheon.edex.plugin.bufrmos/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
+++ /dev/null
@@ -1,9 +0,0 @@
-com.raytheon.edex.plugin.bufrmos.common.BufrMosData
-com.raytheon.edex.plugin.bufrmos.common.BufrMosDataLocation
-com.raytheon.edex.plugin.bufrmos.common.BufrMosAvnData
-com.raytheon.edex.plugin.bufrmos.common.BufrMosEtaData
-com.raytheon.edex.plugin.bufrmos.common.BufrMosGfsData
-com.raytheon.edex.plugin.bufrmos.common.BufrMosHpcData
-com.raytheon.edex.plugin.bufrmos.common.BufrMosLampData
-com.raytheon.edex.plugin.bufrmos.common.BufrMosMrfData
-com.raytheon.edex.plugin.bufrmos.common.BufrMosNgmData
diff --git a/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosAvnData.java b/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosAvnData.java
index 79a9700b63..5f75b2fce3 100644
--- a/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosAvnData.java
+++ b/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosAvnData.java
@@ -26,9 +26,6 @@ import javax.persistence.Entity;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.UniqueConstraint;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
 
 import org.hibernate.annotations.Index;
 
@@ -53,6 +50,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
  * May 14, 2013 1869       bsteffen    Remove DataURI column from bufrmos.
  * Aug 19, 2013 2275       bsteffen    Add dataURI column back into bufrmos
  *                                     types.
+ * Nov 04, 2013 2361       njensen     Remove XML annotations
  * 
  * </pre>
  * 
@@ -73,8 +71,6 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
 				@Index(name = "bufrmosAvn_refTimeIndex", columnNames = { "refTime", "forecastTime" } )
 		}
 )
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.NONE)
 @DynamicSerialize
 public class BufrMosAvnData extends BufrMosData {
     @Override
diff --git a/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosData.java b/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosData.java
index d84ee06f9e..8fde8b7356 100644
--- a/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosData.java
+++ b/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosData.java
@@ -28,11 +28,6 @@ import javax.persistence.MappedSuperclass;
 import javax.persistence.PrimaryKeyJoinColumn;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Transient;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
 
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
 import com.raytheon.uf.common.dataplugin.annotations.DataURI;
@@ -59,6 +54,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
  *                                     Entity  annotation to MappedSuperClass.
  * May 14, 2013 1869       bsteffen    Remove DataURI column from bufrmos.
  * Aug 30, 2013 2298       rjpeter     Make getPluginName abstract
+ * Nov 04, 2013 2361       njensen     Remove XML annotations
  * 
  * </pre>
  * 
@@ -68,8 +64,6 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
 @MappedSuperclass
 @SequenceGenerator(name = PluginDataObject.ID_GEN)
 @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.NONE)
 @DynamicSerialize
 public abstract class BufrMosData extends PersistablePluginDataObject implements
         IPersistable, IPointData {
@@ -84,7 +78,6 @@ public abstract class BufrMosData extends PersistablePluginDataObject implements
 
     // Text of the WMO header
     @Transient
-    @XmlAttribute
     @DynamicSerializeElement
     private String wmoHeader;
 
@@ -95,7 +88,6 @@ public abstract class BufrMosData extends PersistablePluginDataObject implements
     @ManyToOne(cascade = { CascadeType.REFRESH })
     @PrimaryKeyJoinColumn
     @DataURI(position = 1, embedded = true)
-    @XmlElement
     @DynamicSerializeElement
     private BufrMosDataLocation location;
 
diff --git a/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosDataLocation.java b/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosDataLocation.java
index 1d455bdba4..1dbb1b5bcf 100644
--- a/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosDataLocation.java
+++ b/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosDataLocation.java
@@ -24,10 +24,6 @@ import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
 import javax.persistence.UniqueConstraint;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
 
 import org.hibernate.annotations.Index;
 
@@ -49,6 +45,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
  * Jun 28, 2012 827        dgilling    Annotate id field for serialization.
  * Jul 26, 2013 1051       bsteffen    Discard bufrmos data with invalid
  *                                     location.
+ * Nov 04, 2013 2361       njensen     Remove XML annotations
  * 
  * </pre>
  * 
@@ -58,8 +55,6 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
 @Entity
 @Table(name = "bufrmos_location", uniqueConstraints = { @UniqueConstraint(columnNames = {
         "stationId", "latitude", "longitude" }) })
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.NONE)
 @DynamicSerialize
 public class BufrMosDataLocation extends PersistableDataObject {
     private static final long serialVersionUID = 1L;
@@ -73,19 +68,16 @@ public class BufrMosDataLocation extends PersistableDataObject {
     @Column(length = 48)
     @Index(name = "mosLocationStationIndex")
     @DataURI(position = 0)
-    @XmlAttribute
     @DynamicSerializeElement
     private String stationId;
 
     @DataURI(position = 1)
     @Column
-    @XmlAttribute
     @DynamicSerializeElement
     private Double latitude;
 
     @DataURI(position = 2)
     @Column
-    @XmlAttribute
     @DynamicSerializeElement
     private Double longitude;
 
diff --git a/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosEtaData.java b/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosEtaData.java
index fe9f5b155a..f6c018ae02 100644
--- a/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosEtaData.java
+++ b/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosEtaData.java
@@ -26,9 +26,6 @@ import javax.persistence.Entity;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.UniqueConstraint;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
 
 import org.hibernate.annotations.Index;
 
@@ -49,6 +46,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
  * Apr 12, 2013 1857       bgonzale    Added SequenceGenerator annotation.
  * May 07, 2013 1869       bsteffen    Remove dataURI column from
  *                                     PluginDataObject.
+ * Nov 04, 2013 2361       njensen     Remove XML annotations
  * 
  * </pre>
  * 
@@ -68,8 +66,6 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
 				@Index(name = "bufrmosEta_refTimeIndex", columnNames = { "refTime", "forecastTime" } )
 		}
 )
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.NONE)
 @DynamicSerialize
 public class BufrMosEtaData extends BufrMosData {
     @Override
diff --git a/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosGfsData.java b/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosGfsData.java
index d6c6585508..a7cc5e9b65 100644
--- a/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosGfsData.java
+++ b/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosGfsData.java
@@ -26,9 +26,6 @@ import javax.persistence.Entity;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.UniqueConstraint;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
 
 import org.hibernate.annotations.Index;
 
@@ -49,6 +46,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
  * Apr 12, 2013 1857       bgonzale    Added SequenceGenerator annotation.
  * May 07, 2013 1869       bsteffen    Remove dataURI column from
  *                                     PluginDataObject.
+ * Nov 04, 2013 2361       njensen     Remove XML annotations
  * 
  * </pre>
  * 
@@ -68,8 +66,6 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
 				@Index(name = "bufrmosGfs_refTimeIndex", columnNames = { "refTime", "forecastTime" } )
 		}
 )
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.NONE)
 @DynamicSerialize
 public class BufrMosGfsData extends BufrMosData {
     @Override
diff --git a/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosHpcData.java b/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosHpcData.java
index bbc388319c..078926c80a 100644
--- a/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosHpcData.java
+++ b/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosHpcData.java
@@ -26,9 +26,6 @@ import javax.persistence.Entity;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.UniqueConstraint;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
 
 import org.hibernate.annotations.Index;
 
@@ -53,6 +50,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
  * May 14, 2013 1869       bsteffen    Remove DataURI column from bufrmos.
  * Aug 19, 2013 2275       bsteffen    Add dataURI column back into bufrmos
  *                                     types.
+ * Nov 04, 2013 2361       njensen     Remove XML annotations
  * 
  * </pre>
  * 
@@ -73,8 +71,6 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
 				@Index(name = "bufrmosHpc_refTimeIndex", columnNames = { "refTime", "forecastTime" } )
 		}
 )
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.NONE)
 @DynamicSerialize
 public class BufrMosHpcData extends BufrMosData {
     @Override
diff --git a/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosLampData.java b/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosLampData.java
index 707d166d77..c813aec30a 100644
--- a/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosLampData.java
+++ b/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosLampData.java
@@ -26,9 +26,6 @@ import javax.persistence.Entity;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.UniqueConstraint;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
 
 import org.hibernate.annotations.Index;
 
@@ -49,6 +46,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
  * Apr 12, 2013       1857 bgonzale    Added SequenceGenerator annotation.
  * May 07, 2013 1869       bsteffen    Remove dataURI column from
  *                                     PluginDataObject.
+ * Nov 04, 2013 2361       njensen     Remove XML annotations
  * 
  * </pre>
  * 
@@ -68,8 +66,6 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
 				@Index(name = "bufrmosLamp_refTimeIndex", columnNames = { "refTime", "forecastTime" } )
 		}
 )
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.NONE)
 @DynamicSerialize
 public class BufrMosLampData extends BufrMosData {
     @Override
diff --git a/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosMrfData.java b/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosMrfData.java
index ffc865f2f4..aa7694743c 100644
--- a/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosMrfData.java
+++ b/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosMrfData.java
@@ -26,9 +26,6 @@ import javax.persistence.Entity;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.UniqueConstraint;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
 
 import org.hibernate.annotations.Index;
 
@@ -49,6 +46,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
  * Apr 12, 2013       1857 bgonzale    Added SequenceGenerator annotation.
  * May 07, 2013 1869       bsteffen    Remove dataURI column from
  *                                     PluginDataObject.
+ * Nov 04, 2013 2361       njensen     Remove XML annotations
  * 
  * </pre>
  * 
@@ -68,8 +66,6 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
 				@Index(name = "bufrmosMrf_refTimeIndex", columnNames = { "refTime", "forecastTime" } )
 		}
 )
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.NONE)
 @DynamicSerialize
 public class BufrMosMrfData extends BufrMosData {
     @Override
diff --git a/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosNgmData.java b/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosNgmData.java
index b2982de3cf..c437682ff4 100644
--- a/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosNgmData.java
+++ b/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosNgmData.java
@@ -26,9 +26,6 @@ import javax.persistence.Entity;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.UniqueConstraint;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
 
 import org.hibernate.annotations.Index;
 
@@ -49,6 +46,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
  * Apr 12, 2013       1857 bgonzale    Added SequenceGenerator annotation.
  * May 07, 2013 1869       bsteffen    Remove dataURI column from
  *                                     PluginDataObject.
+ * Nov 04, 2013 2361       njensen     Remove XML annotations
  * 
  * </pre>
  * 
@@ -68,8 +66,6 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
 				@Index(name = "bufrmosNgm_refTimeIndex", columnNames = { "refTime", "forecastTime" } )
 		}
 )
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.NONE)
 @DynamicSerialize
 public class BufrMosNgmData extends BufrMosData {
     @Override