diff --git a/cave/com.raytheon.uf.viz.monitor.ffmp/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject b/cave/com.raytheon.uf.viz.monitor.ffmp/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
deleted file mode 100644
index 17d6c832fe..0000000000
--- a/cave/com.raytheon.uf.viz.monitor.ffmp/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
+++ /dev/null
@@ -1 +0,0 @@
-com.raytheon.uf.viz.monitor.ffmp.ui.rsc.FFMPResourceData
\ No newline at end of file
diff --git a/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/xml/FFMPConfigBasinXML.java b/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/xml/FFMPConfigBasinXML.java
index 9f2cd2efbd..be50da4b8c 100644
--- a/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/xml/FFMPConfigBasinXML.java
+++ b/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/xml/FFMPConfigBasinXML.java
@@ -29,8 +29,6 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElements;
import javax.xml.bind.annotation.XmlRootElement;
-import com.raytheon.uf.common.serialization.ISerializableObject;
-
/**
* Config Basin xml object.
*
@@ -38,10 +36,10 @@ import com.raytheon.uf.common.serialization.ISerializableObject;
*
* SOFTWARE HISTORY
*
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Initial creation
- * Apr 12, 2013 1902 mpduff Return a FFMPTableColumnXML object.
+ * Date Ticket# Engineer Description
+ * ------------- -------- ----------- --------------------------
+ * Apr 12, 2013 1902 mpduff Return a FFMPTableColumnXML object.
+ * Oct 24, 2013 2491 bsteffen Remove ISerializableObject
*
*
*
@@ -49,7 +47,7 @@ import com.raytheon.uf.common.serialization.ISerializableObject;
@XmlRootElement(name = "FfmpConfigBasin")
@XmlAccessorType(XmlAccessType.NONE)
-public class FFMPConfigBasinXML implements ISerializableObject {
+public class FFMPConfigBasinXML {
/**
* When on, the Basin Table will use the time of the D2D frame that launched
* it. When off the Basin Table will either use the most recent time in the
diff --git a/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/xml/FFMPTableColumnXML.java b/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/xml/FFMPTableColumnXML.java
index bf6abc90b4..693be0a18e 100644
--- a/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/xml/FFMPTableColumnXML.java
+++ b/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/xml/FFMPTableColumnXML.java
@@ -23,10 +23,22 @@ import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
-import com.raytheon.uf.common.serialization.ISerializableObject;
-
+/**
+ * Table column xml object.
+ *
+ *
+ *
+ * SOFTWARE HISTORY
+ *
+ * Date Ticket# Engineer Description
+ * ------------- -------- ----------- --------------------------
+ * Oct 24, 2013 2491 bsteffen Remove ISerializableObject
+ *
+ *
+ *
+ */
@XmlAccessorType(XmlAccessType.NONE)
-public class FFMPTableColumnXML implements ISerializableObject
+public class FFMPTableColumnXML
{
@XmlElement(name = "ColumnName")
private String columnName;
diff --git a/cave/com.raytheon.uf.viz.monitor.fog/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject b/cave/com.raytheon.uf.viz.monitor.fog/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
deleted file mode 100644
index f552654430..0000000000
--- a/cave/com.raytheon.uf.viz.monitor.fog/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
+++ /dev/null
@@ -1 +0,0 @@
-com.raytheon.uf.viz.monitor.fog.ui.resource.FogResourceData
diff --git a/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/xml/FogMonitorAlgorithmXML.java b/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/xml/FogMonitorAlgorithmXML.java
index 7aa79ddd7b..e1b2949c32 100644
--- a/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/xml/FogMonitorAlgorithmXML.java
+++ b/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/xml/FogMonitorAlgorithmXML.java
@@ -24,12 +24,27 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
-import com.raytheon.uf.common.serialization.ISerializableObject;
-
+/**
+ *
+ * Class for serialization of xml describing a fog monitor algorithm.
+ *
+ *
+ *
+ * SOFTWARE HISTORY
+ *
+ * Date Ticket# Engineer Description
+ * ------------- -------- ----------- --------------------------
+ * Oct 24, 2013 2491 bsteffen Remove ISerializableObject
+ *
+ *
+ *
+ * @author unknown
+ * @version 1.0
+ */
@XmlRootElement(name = "FogMonitorAlgorithm")
@XmlAccessorType(XmlAccessType.NONE)
-public class FogMonitorAlgorithmXML implements ISerializableObject
-{
+public class FogMonitorAlgorithmXML {
+
@XmlElement(name = "FogProductYLo")
private double fogProductYLo;
diff --git a/cave/com.raytheon.uf.viz.monitor.scan/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject b/cave/com.raytheon.uf.viz.monitor.scan/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
deleted file mode 100644
index b72acf89dd..0000000000
--- a/cave/com.raytheon.uf.viz.monitor.scan/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
+++ /dev/null
@@ -1,2 +0,0 @@
-com.raytheon.uf.viz.monitor.scan.resource.ScanResourceData
-com.raytheon.uf.viz.monitor.scan.resource.CWATLocalThreatResourceData
\ No newline at end of file
diff --git a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/data/DMDScanData.java b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/data/DMDScanData.java
index 9db865bef2..f7725071b3 100644
--- a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/data/DMDScanData.java
+++ b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/data/DMDScanData.java
@@ -1,22 +1,24 @@
+/**
+ * This software was developed and / or modified by Raytheon Company,
+ * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+ *
+ * U.S. EXPORT CONTROLLED TECHNICAL DATA
+ * This software product contains export-restricted data whose
+ * export/transfer/disclosure is restricted by U.S. law. Dissemination
+ * to non-U.S. persons whether in the United States or abroad requires
+ * an export license or other authorization.
+ *
+ * Contractor Name: Raytheon Company
+ * Contractor Address: 6825 Pine Street, Suite 340
+ * Mail Stop B8
+ * Omaha, NE 68106
+ * 402.291.0100
+ *
+ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+ * further licensing information.
+ **/
package com.raytheon.uf.viz.monitor.scan.data;
-/**
- *
- * DMDScanData
- *
- *
- * SOFTWARE HISTORY
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Mar 25, 2010 4288 dhladky Initial creation
- *
- *
- * @author dhladky
- * @version 1.0
- *
- */
-
-import java.util.Date;
import java.util.HashMap;
import java.util.Set;
import java.util.TreeMap;
@@ -24,9 +26,25 @@ import java.util.TreeMap;
import com.raytheon.uf.common.dataplugin.scan.data.DMDTableDataRow;
import com.raytheon.uf.common.dataplugin.scan.data.ScanTableData;
import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums;
-import com.raytheon.uf.common.serialization.ISerializableObject;
-public class DMDScanData implements ISerializableObject {
+/**
+ *
+ * DMDScanData
+ *
+ *
+ * SOFTWARE HISTORY
+ * Date Ticket# Engineer Description
+ * ------------- -------- ----------- --------------------------
+ * Mar 25, 2010 4288 dhladky Initial creation
+ * Oct 23, 2013 2491 bsteffen Remove ISerializableObject
+ *
+ *
+ *
+ * @author dhladky
+ * @version 1.0
+ *
+ */
+public class DMDScanData {
private HashMap> data = null;
diff --git a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/data/DMDTimeHeight.java b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/data/DMDTimeHeight.java
deleted file mode 100644
index 18333da95e..0000000000
--- a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/data/DMDTimeHeight.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- *
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- *
- * Contractor Name: Raytheon Company
- * Contractor Address: 6825 Pine Street, Suite 340
- * Mail Stop B8
- * Omaha, NE 68106
- * 402.291.0100
- *
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
- **/
-package com.raytheon.uf.viz.monitor.scan.data;
-
-import com.raytheon.uf.common.serialization.ISerializableObject;
-
-/**
- * Contains the data used for the time-height graph.
- *
- *
- *
- * SOFTWARE HISTORY
- *
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * May 10, 2010 lvenable Initial creation
- *
- *
- *
- * @author lvenable
- * @version 1.0
- */
-public class DMDTimeHeight implements ISerializableObject{
- /**
- * The ident of the data.
- */
- private String ident;
-
- /**
- * Time offset in milliseconds.
- */
- public Long offset;
-
- /**
- * Value.
- */
- public Double value;
-
- /**
- * Height in kft.
- */
- public Double height;
-
- /**
- * Low level diameter.
- */
- public Double llDiam;
-
- /**
- * Constructor.
- */
- public DMDTimeHeight() {
-
- }
-
- /**
- * Get the time offset.
- * @return The time offset.
- */
- public Long getOffset() {
- return offset;
- }
-
- /**
- * Set the time offset.
- * @param offset The time offset.
- */
- public void setOffset(Long offset) {
- this.offset = offset;
- }
-
- /**
- * Get the value.
- * @return The value.
- */
- public Double getValue() {
- return value;
- }
-
- /**
- * Set the value.
- * @param value The value.
- */
- public void setValue(Double value) {
- this.value = value;
- }
-
- /**
- * Get the height in kft.
- * @return Height in kft.
- */
- public Double getHeight() {
- return height;
- }
-
- /**
- * Set the height in kft.
- * @param height Height in kft.
- */
- public void setHeight(Double height) {
- this.height = height;
- }
-
- /**
- *
- * @return
- */
- public Double getLlDiam() {
- return llDiam;
- }
-
- public void setLlDiam(Double llDiam) {
- this.llDiam = llDiam;
- }
-
- /**
- * @param ident the ident to set
- */
- public void setIdent(String ident) {
- this.ident = ident;
- }
-
- /**
- * @return the ident
- */
- public String getIdent() {
- return ident;
- }
-}
diff --git a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/xml/ScanRunConfigXML.java b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/xml/ScanRunConfigXML.java
index 8f7fb48b20..f44436fb26 100644
--- a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/xml/ScanRunConfigXML.java
+++ b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/xml/ScanRunConfigXML.java
@@ -24,28 +24,27 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
-import com.raytheon.uf.common.serialization.ISerializableObject;
-
/**
* Scan Run Configuration accessor.
*
*
- *
+ *
* SOFTWARE HISTORY
- *
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Apr 20, 2011 mpduff Initial creation
- *
+ *
+ * Date Ticket# Engineer Description
+ * ------------- -------- ----------- --------------------------
+ * Apr 20, 2011 mpduff Initial creation
+ * Oct 23, 2013 2491 bsteffen Remove ISerializableObject
+ *
*
- *
+ *
* @author mpduff
- * @version 1.0
+ * @version 1.0
*/
@XmlRootElement(name = "scanRunConfig")
@XmlAccessorType(XmlAccessType.NONE)
-public class ScanRunConfigXML implements ISerializableObject {
+public class ScanRunConfigXML {
@XmlElement(name="vcpList")
private ScanVcpListXML vcpList;
diff --git a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/xml/ScanSampleConfigXML.java b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/xml/ScanSampleConfigXML.java
index 265278e0e6..8477be495e 100644
--- a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/xml/ScanSampleConfigXML.java
+++ b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/xml/ScanSampleConfigXML.java
@@ -24,8 +24,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
-import com.raytheon.uf.common.serialization.ISerializableObject;
-
/**
* SCAN Sample Configuration XML.
*
@@ -33,9 +31,10 @@ import com.raytheon.uf.common.serialization.ISerializableObject;
*
* SOFTWARE HISTORY
*
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Apr 5, 2011 mpduff Initial creation
+ * Date Ticket# Engineer Description
+ * ------------- -------- ----------- --------------------------
+ * Apr 5, 2011 mpduff Initial creation
+ * Oct 23, 2013 2491 bsteffen Remove ISerializableObject
*
*
*
@@ -45,7 +44,7 @@ import com.raytheon.uf.common.serialization.ISerializableObject;
@XmlRootElement(name = "ScanSampleConfig")
@XmlAccessorType(XmlAccessType.NONE)
-public class ScanSampleConfigXML implements ISerializableObject {
+public class ScanSampleConfigXML {
@XmlElement(name="cellSampleConfig", type=CellXML.class)
private CellXML cellSampleConfig;
diff --git a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/xml/ScanVcpListXML.java b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/xml/ScanVcpListXML.java
index 4046524981..4f7d0bbfce 100644
--- a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/xml/ScanVcpListXML.java
+++ b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/xml/ScanVcpListXML.java
@@ -26,27 +26,25 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElements;
-import com.raytheon.uf.common.serialization.ISerializableObject;
-
/**
* VCP List.
*
*
- *
+ *
* SOFTWARE HISTORY
- *
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Apr 20, 2011 mpduff Initial creation
- *
+ *
+ * Date Ticket# Engineer Description
+ * ------------- -------- ----------- --------------------------
+ * Apr 20, 2011 mpduff Initial creation
+ * Oct 23, 2013 2491 bsteffen Remove ISerializableObject
+ *
*
- *
+ *
* @author mpduff
- * @version 1.0
+ * @version 1.0
*/
-
@XmlAccessorType(XmlAccessType.NONE)
-public class ScanVcpListXML implements ISerializableObject {
+public class ScanVcpListXML {
@XmlElements({ @XmlElement(name = "vcp", type = ScanVcpXML.class) })
private ArrayList vcpData;
diff --git a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/xml/ScanVcpXML.java b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/xml/ScanVcpXML.java
index 19cedc6cba..8534a0d4ef 100644
--- a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/xml/ScanVcpXML.java
+++ b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/xml/ScanVcpXML.java
@@ -23,27 +23,26 @@ import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
-import com.raytheon.uf.common.serialization.ISerializableObject;
-
/**
- * SCAN VCP Configuration
+ * SCAN VCP Configuration
*
*
- *
+ *
* SOFTWARE HISTORY
- *
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Apr 20, 2011 mpduff Initial creation
- *
+ *
+ * Date Ticket# Engineer Description
+ * ------------- -------- ----------- --------------------------
+ * Apr 20, 2011 mpduff Initial creation
+ * Oct 23, 2013 2491 bsteffen Remove ISerializableObject
+ *
*
- *
+ *
* @author mpduff
- * @version 1.0
+ * @version 1.0
*/
@XmlAccessorType(XmlAccessType.NONE)
-public class ScanVcpXML implements ISerializableObject {
+public class ScanVcpXML {
@XmlAttribute(name = "num")
private int number;