refactor: Remove ATS WorkItemDefinition code for DB Configuration
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDatabaseConfig.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDatabaseConfig.java
index 0080577..de2804a 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDatabaseConfig.java
+++ b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDatabaseConfig.java
@@ -12,11 +12,6 @@
 
 import org.eclipse.osee.ats.config.demo.DemoCISBuilds;
 import org.eclipse.osee.ats.config.demo.DemoSubsystems;
-import org.eclipse.osee.ats.config.demo.workflow.DemoCodeWorkFlowDefinition;
-import org.eclipse.osee.ats.config.demo.workflow.DemoReqWorkFlowDefinition;
-import org.eclipse.osee.ats.config.demo.workflow.DemoSWDesignWorkFlowDefinition;
-import org.eclipse.osee.ats.config.demo.workflow.DemoTestWorkFlowDefinition;
-import org.eclipse.osee.ats.util.AtsUtil;
 import org.eclipse.osee.framework.core.data.IOseeBranch;
 import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
@@ -27,7 +22,6 @@
 import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
 import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
 import org.eclipse.osee.framework.skynet.core.utility.Requirements;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinition.WriteType;
 import org.eclipse.osee.support.test.util.DemoSawBuilds;
 import org.eclipse.osee.support.test.util.TestUtil;
 
@@ -43,13 +37,6 @@
 
       TestUtil.setDemoDb(true);
 
-      if (AtsUtil.dbInitWorkItemDefs()) {
-         new DemoCodeWorkFlowDefinition().config(WriteType.New, null);
-         new DemoTestWorkFlowDefinition().config(WriteType.New, null);
-         new DemoReqWorkFlowDefinition().config(WriteType.New, null);
-         new DemoSWDesignWorkFlowDefinition().config(WriteType.New, null);
-      }
-
       // Create SAW_Bld_1 branch
       BranchManager.createTopLevelBranch(DemoSawBuilds.SAW_Bld_1);
       populateProgramBranch(DemoSawBuilds.SAW_Bld_1);
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/workflow/DemoAddDecisionReviewRule.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/workflow/DemoAddDecisionReviewRule.java
deleted file mode 100644
index f5f5cdd..0000000
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/workflow/DemoAddDecisionReviewRule.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.config.demo.workflow;
-
-import java.util.logging.Level;
-import org.eclipse.osee.ats.config.demo.internal.OseeAtsConfigDemoActivator;
-import org.eclipse.osee.ats.workdef.ReviewBlockType;
-import org.eclipse.osee.ats.workdef.StateEventType;
-import org.eclipse.osee.ats.workflow.item.AtsAddDecisionReviewRule;
-import org.eclipse.osee.framework.logging.OseeLog;
-
-/**
- * @author Donald G. Dunne
- */
-public class DemoAddDecisionReviewRule extends AtsAddDecisionReviewRule {
-
-   public static String NAME = "atsAddDecisionReview.test.addDecisionReview";
-
-   public DemoAddDecisionReviewRule(String forState, ReviewBlockType reviewBlockType, StateEventType stateEventType) {
-      super(NAME + "." + forState + "." + reviewBlockType.name() + "." + stateEventType,
-         NAME + "." + forState + "." + reviewBlockType.name() + "." + stateEventType);
-      setDescription("This is a rule created to test the Review rules.");
-      setDecisionParameterValue(this, DecisionParameter.title, "Auto-created Decision Review from ruleId: " + getName());
-      setDecisionParameterValue(this, DecisionParameter.reviewBlockingType, reviewBlockType.name());
-      setDecisionParameterValue(this, DecisionParameter.forState, forState);
-      setDecisionParameterValue(this, DecisionParameter.forEvent, stateEventType.name());
-      try {
-         setDecisionParameterValue(this, DecisionParameter.assignees, "<99999997>");
-         setDecisionParameterValue(this, DecisionParameter.options, "Completed;Completed;");
-      } catch (Exception ex) {
-         OseeLog.log(OseeAtsConfigDemoActivator.class, Level.SEVERE, ex);
-      }
-   }
-}
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/workflow/DemoAddPeerToPeerReviewRule.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/workflow/DemoAddPeerToPeerReviewRule.java
deleted file mode 100644
index ce57d45..0000000
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/workflow/DemoAddPeerToPeerReviewRule.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.config.demo.workflow;
-
-import java.util.logging.Level;
-import org.eclipse.osee.ats.config.demo.internal.OseeAtsConfigDemoActivator;
-import org.eclipse.osee.ats.workdef.ReviewBlockType;
-import org.eclipse.osee.ats.workdef.StateEventType;
-import org.eclipse.osee.ats.workflow.item.AtsAddDecisionReviewRule;
-import org.eclipse.osee.framework.logging.OseeLog;
-
-/**
- * @author Donald G. Dunne
- */
-public class DemoAddPeerToPeerReviewRule extends AtsAddDecisionReviewRule {
-
-   public static String ID = "atsAddPeerToPeerReview.test.addPeerToPeerReview";
-
-   public DemoAddPeerToPeerReviewRule(String forState, ReviewBlockType reviewBlockType, StateEventType stateEventType) {
-      super(ID + "." + forState + "." + reviewBlockType.name() + "." + stateEventType,
-         ID + "." + forState + "." + reviewBlockType.name() + "." + stateEventType);
-      setDescription("This is a rule created to test the Review rules.");
-      setDecisionParameterValue(this, DecisionParameter.title, "Auto-created Decision Review from ruleId " + getName());
-      setDecisionParameterValue(this, DecisionParameter.reviewBlockingType, reviewBlockType.name());
-      setDecisionParameterValue(this, DecisionParameter.forState, forState);
-      setDecisionParameterValue(this, DecisionParameter.forEvent, stateEventType.name());
-      try {
-         setDecisionParameterValue(this, DecisionParameter.assignees, "<99999997>");
-      } catch (Exception ex) {
-         OseeLog.log(OseeAtsConfigDemoActivator.class, Level.SEVERE, ex);
-      }
-   }
-}
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/workflow/DemoCodeWorkFlowDefinition.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/workflow/DemoCodeWorkFlowDefinition.java
deleted file mode 100644
index fa796b9..0000000
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/workflow/DemoCodeWorkFlowDefinition.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.config.demo.workflow;
-
-import org.eclipse.osee.ats.workflow.flow.TeamWorkflowDefinition;
-import org.eclipse.osee.ats.workflow.item.AtsStatePercentCompleteWeightDefaultWorkflowRule;
-import org.eclipse.osee.ats.workflow.item.AtsWorkDefinitions;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.ui.skynet.results.XResultData;
-
-/**
- * @author Donald G. Dunne
- */
-public class DemoCodeWorkFlowDefinition extends TeamWorkflowDefinition {
-
-   public static String ID = "demo.code";
-
-   public DemoCodeWorkFlowDefinition() {
-      super(ID, ID);
-      addWorkItem(AtsStatePercentCompleteWeightDefaultWorkflowRule.ID);
-   }
-
-   @Override
-   public void config(WriteType writeType, XResultData xResultData) throws OseeCoreException {
-      AtsWorkDefinitions.importWorkItemDefinitionsIntoDb(writeType, xResultData,
-         TeamWorkflowDefinition.getWorkPageDefinitionsForId(getId()));
-      AtsWorkDefinitions.importWorkItemDefinitionsIntoDb(writeType, xResultData, new DemoCodeWorkFlowDefinition());
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/workflow/DemoReqWorkFlowDefinition.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/workflow/DemoReqWorkFlowDefinition.java
deleted file mode 100644
index d6e8a18..0000000
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/workflow/DemoReqWorkFlowDefinition.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.config.demo.workflow;
-
-import org.eclipse.osee.ats.util.TeamState;
-import org.eclipse.osee.ats.workflow.flow.TeamWorkflowDefinition;
-import org.eclipse.osee.ats.workflow.item.AtsStatePercentCompleteWeightDefaultWorkflowRule;
-import org.eclipse.osee.ats.workflow.item.AtsWorkDefinitions;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.ui.skynet.results.XResultData;
-
-/**
- * @author Donald G. Dunne
- */
-public class DemoReqWorkFlowDefinition extends TeamWorkflowDefinition {
-
-   public static String ID = "demo.req";
-
-   public DemoReqWorkFlowDefinition() {
-      super(ID, ID, TeamWorkflowDefinition.ID);
-      addWorkItem(AtsStatePercentCompleteWeightDefaultWorkflowRule.ID);
-   }
-
-   @Override
-   public void config(WriteType writeType, XResultData xResultData) throws OseeCoreException {
-      AtsWorkDefinitions.importWorkItemDefinitionsIntoDb(writeType, xResultData,
-         TeamWorkflowDefinition.getWorkPageDefinitionsForId(getId()));
-      AtsWorkDefinitions.importWorkItemDefinitionsIntoDb(writeType, xResultData, new DemoReqWorkFlowDefinition());
-      AtsWorkDefinitions.relatePageToBranchCommitRules(ID + "." + TeamState.Implement.getPageName());
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/workflow/DemoSWDesignWorkFlowDefinition.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/workflow/DemoSWDesignWorkFlowDefinition.java
deleted file mode 100644
index 03185f5..0000000
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/workflow/DemoSWDesignWorkFlowDefinition.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.config.demo.workflow;
-
-import java.util.Arrays;
-import org.eclipse.osee.ats.util.TeamState;
-import org.eclipse.osee.ats.workdef.ReviewBlockType;
-import org.eclipse.osee.ats.workdef.StateEventType;
-import org.eclipse.osee.ats.workflow.flow.TeamWorkflowDefinition;
-import org.eclipse.osee.ats.workflow.item.AtsStatePercentCompleteWeightDefaultWorkflowRule;
-import org.eclipse.osee.ats.workflow.item.AtsWorkDefinitions;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.ui.skynet.results.XResultData;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinitionFactory;
-
-/**
- * @author Donald G. Dunne
- */
-public class DemoSWDesignWorkFlowDefinition extends TeamWorkflowDefinition {
-
-   public static String ID = "demo.swdesign";
-
-   public DemoSWDesignWorkFlowDefinition() {
-      super(ID, ID, TeamWorkflowDefinition.ID);
-      addWorkItem(AtsStatePercentCompleteWeightDefaultWorkflowRule.ID);
-   }
-
-   @Override
-   public void config(WriteType writeType, XResultData xResultData) throws OseeCoreException {
-      // Create decision and peer rules
-      DemoAddDecisionReviewRule decisionTransitionToRule =
-         new DemoAddDecisionReviewRule(TeamState.Analyze.getPageName(), ReviewBlockType.None,
-            StateEventType.TransitionTo);
-      DemoAddDecisionReviewRule decisionCreateBranchRule =
-         new DemoAddDecisionReviewRule(TeamState.Implement.getPageName(), ReviewBlockType.None,
-            StateEventType.CreateBranch);
-      DemoAddPeerToPeerReviewRule peerTransitionToRule =
-         new DemoAddPeerToPeerReviewRule(TeamState.Authorize.getPageName(), ReviewBlockType.None,
-            StateEventType.TransitionTo);
-      DemoAddPeerToPeerReviewRule peerCommitBranchRule =
-         new DemoAddPeerToPeerReviewRule(TeamState.Implement.getPageName(), ReviewBlockType.None,
-            StateEventType.CommitBranch);
-
-      // Import decision and peer rules into database
-      AtsWorkDefinitions.importWorkItemDefinitionsIntoDb(writeType, null,
-         Arrays.asList(decisionTransitionToRule, decisionCreateBranchRule, peerTransitionToRule, peerCommitBranchRule));
-
-      // Add Normal SW_Design workflows
-      AtsWorkDefinitions.importWorkItemDefinitionsIntoDb(writeType, xResultData,
-         TeamWorkflowDefinition.getWorkPageDefinitionsForId(getId()));
-      AtsWorkDefinitions.importWorkItemDefinitionsIntoDb(writeType, xResultData, new DemoSWDesignWorkFlowDefinition());
-      AtsWorkDefinitions.relatePageToBranchCommitRules(ID + "." + TeamState.Implement.getPageName());
-
-      // Add Non-blocking createBranch decision review to Implement state
-      WorkItemDefinitionFactory.relateWorkItemDefinitions(ID + "." + TeamState.Analyze.getPageName(),
-         decisionTransitionToRule.getName());
-      WorkItemDefinitionFactory.relateWorkItemDefinitions(ID + "." + TeamState.Implement.getPageName(),
-         decisionCreateBranchRule.getName());
-
-      // Add Non-blocking commitBranch peerToPeer review to Implement state
-      WorkItemDefinitionFactory.relateWorkItemDefinitions(ID + "." + TeamState.Authorize.getPageName(),
-         peerTransitionToRule.getName());
-      WorkItemDefinitionFactory.relateWorkItemDefinitions(ID + "." + TeamState.Implement.getPageName(),
-         peerCommitBranchRule.getName());
-   }
-}
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/workflow/DemoTestWorkFlowDefinition.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/workflow/DemoTestWorkFlowDefinition.java
deleted file mode 100644
index 19d4f21..0000000
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/workflow/DemoTestWorkFlowDefinition.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.config.demo.workflow;
-
-import org.eclipse.osee.ats.workflow.flow.TeamWorkflowDefinition;
-import org.eclipse.osee.ats.workflow.item.AtsStatePercentCompleteWeightDefaultWorkflowRule;
-import org.eclipse.osee.ats.workflow.item.AtsWorkDefinitions;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.ui.skynet.results.XResultData;
-
-/**
- * @author Donald G. Dunne
- */
-public class DemoTestWorkFlowDefinition extends TeamWorkflowDefinition {
-
-   public static String ID = "demo.test";
-
-   public DemoTestWorkFlowDefinition() {
-      super(ID, ID, TeamWorkflowDefinition.ID);
-      addWorkItem(AtsStatePercentCompleteWeightDefaultWorkflowRule.ID);
-   }
-
-   @Override
-   public void config(WriteType writeType, XResultData xResultData) throws OseeCoreException {
-      AtsWorkDefinitions.importWorkItemDefinitionsIntoDb(writeType, xResultData,
-         TeamWorkflowDefinition.getWorkPageDefinitionsForId(getId()));
-      AtsWorkDefinitions.importWorkItemDefinitionsIntoDb(writeType, xResultData, new DemoTestWorkFlowDefinition());
-   }
-}
diff --git a/plugins/org.eclipse.osee.ats/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats/META-INF/MANIFEST.MF
index 4a70453..35e26c9 100644
--- a/plugins/org.eclipse.osee.ats/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.ats/META-INF/MANIFEST.MF
@@ -57,15 +57,7 @@
  org.eclipse.osee.ats.util.xviewer.column,
  org.eclipse.osee.ats.workdef,
  org.eclipse.osee.ats.workflow,
- org.eclipse.osee.ats.workflow.editor,
- org.eclipse.osee.ats.workflow.editor.actions,
- org.eclipse.osee.ats.workflow.editor.model,
- org.eclipse.osee.ats.workflow.editor.model.commands,
- org.eclipse.osee.ats.workflow.editor.parts,
- org.eclipse.osee.ats.workflow.editor.wizard,
- org.eclipse.osee.ats.workflow.flow,
  org.eclipse.osee.ats.workflow.item,
- org.eclipse.osee.ats.workflow.page,
  org.eclipse.osee.ats.workflow.vue,
  org.eclipse.osee.ats.world,
  org.eclipse.osee.ats.world.search
diff --git a/plugins/org.eclipse.osee.ats/plugin.xml b/plugins/org.eclipse.osee.ats/plugin.xml
index 1e3e2f6..201b14f 100644
--- a/plugins/org.eclipse.osee.ats/plugin.xml
+++ b/plugins/org.eclipse.osee.ats/plugin.xml
@@ -34,13 +34,6 @@
                id="org.eclipse.osee.ats.world.WorldEditor"
                name="ATS World Editor">
          </editor>
-         <editor name="ATS Workflow Config Editor"
-              icon="images/workflowConfig.gif"
-              default="true"
-              class="org.eclipse.osee.ats.workflow.editor.AtsWorkflowConfigEditor"
-              contributorClass="org.eclipse.osee.ats.workflow.editor.AtsWorkflowConfigEditorActionBarContributor"
-              id="org.eclipse.osee.ats.workflow.editor.AtsWorkflowConfigEditor">
-         </editor>   
    </extension>
    <extension point="org.eclipse.osee.framework.skynet.core.ArtifactFactory">
       <ArtifactFactory classname="org.eclipse.osee.ats.artifact.AtsArtifactFactory"/>
@@ -69,15 +62,6 @@
             id="org.eclipse.osee.ats.config.wizard.AtsConfigWizard"
             name="ATS Configuration">
       </wizard>
-      <wizard
-            canFinishEarly="false"
-            category="org.eclipse.osee.ats.category"
-            class="org.eclipse.osee.ats.workflow.editor.wizard.AtsWorkflowConfigCreationWizard"
-            hasPages="true"
-            icon="images/workflow.gif"
-            id="org.eclipse.osee.ats.workflow.editor.wizard.AtsWorkflowConfigCreationWizard"
-            name="Workflow Configuration">
-      </wizard>
    </extension>
 <extension point="org.eclipse.ui.perspectives">
    <perspective
@@ -209,9 +193,6 @@
       <Renderer classname="org.eclipse.osee.ats.editor.AtsWorkflowRenderer"/>
       <Renderer classname="org.eclipse.osee.ats.workdef.editor.AtsWorkDefinitionRenderer"/>
       <Renderer
-            classname="org.eclipse.osee.ats.workflow.editor.AtsWorkflowConfigRenderer">
-      </Renderer>
-      <Renderer
             classname="org.eclipse.osee.ats.editor.AtsTaskEditorRenderer">
       </Renderer>
       <Renderer
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ChangeTypeXWidget.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ChangeTypeXWidget.java
deleted file mode 100644
index 8ba64ae..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ChangeTypeXWidget.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Created on Oct 29, 2010
- *
- * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE
- */
-package org.eclipse.osee.ats.column;
-
-import org.eclipse.osee.ats.artifact.AtsAttributeTypes;
-import org.eclipse.osee.ats.workflow.item.AtsAttributeSoleComboXWidgetWorkItem;
-import org.eclipse.osee.framework.ui.skynet.widgets.XOption;
-
-public class ChangeTypeXWidget extends AtsAttributeSoleComboXWidgetWorkItem {
-
-   public ChangeTypeXWidget() {
-      super(AtsAttributeTypes.ChangeType, "OPTIONS_FROM_ATTRIBUTE_VALIDITY", XOption.REQUIRED,
-         XOption.BEGIN_COMPOSITE_6);
-   }
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/EstimatedHoursRequiredXWidget.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/EstimatedHoursRequiredXWidget.java
deleted file mode 100644
index 21b3019..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/EstimatedHoursRequiredXWidget.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Created on Nov 8, 2010
- *
- * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE
- */
-package org.eclipse.osee.ats.column;
-
-import static org.eclipse.osee.framework.ui.skynet.widgets.XOption.REQUIRED;
-import org.eclipse.osee.ats.artifact.AtsAttributeTypes;
-import org.eclipse.osee.ats.workflow.item.AtsAttributeXWidgetWorkItem;
-
-public class EstimatedHoursRequiredXWidget extends AtsAttributeXWidgetWorkItem {
-
-   public EstimatedHoursRequiredXWidget() {
-      super(AtsAttributeTypes.EstimatedHours, "XFloatDam", REQUIRED);
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/EstimatedHoursXWidget.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/EstimatedHoursXWidget.java
deleted file mode 100644
index 26c3ce8..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/EstimatedHoursXWidget.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Created on Nov 8, 2010
- *
- * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE
- */
-package org.eclipse.osee.ats.column;
-
-import org.eclipse.osee.ats.artifact.AtsAttributeTypes;
-import org.eclipse.osee.ats.workflow.item.AtsAttributeXWidgetWorkItem;
-import org.eclipse.osee.framework.ui.skynet.widgets.XOption;
-
-public class EstimatedHoursXWidget extends AtsAttributeXWidgetWorkItem {
-
-   public static final String ATS_ESTIMATED_HOURS_NOT_REQUIRED_ID = AtsAttributeTypes.EstimatedHours + ".notRequired";
-
-   public EstimatedHoursXWidget() {
-      super(AtsAttributeTypes.EstimatedHours.getUnqualifiedName(), ATS_ESTIMATED_HOURS_NOT_REQUIRED_ID,
-         AtsAttributeTypes.EstimatedHours, "XFloatDam", XOption.NOT_REQUIRED);
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/OperationalImpactWithWorkaroundXWidget.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/OperationalImpactWithWorkaroundXWidget.java
index 5511408..df4dcee 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/OperationalImpactWithWorkaroundXWidget.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/OperationalImpactWithWorkaroundXWidget.java
@@ -16,9 +16,6 @@
 import org.eclipse.osee.framework.ui.plugin.util.Result;
 import org.eclipse.osee.framework.ui.skynet.widgets.IArtifactWidget;
 import org.eclipse.osee.framework.ui.skynet.widgets.XComboWithTextAndComboWithText;
-import org.eclipse.osee.framework.ui.skynet.widgets.XOption;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.DynamicXWidgetLayoutData;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkWidgetDefinition;
 import org.eclipse.osee.framework.ui.swt.Widgets;
 import org.eclipse.swt.widgets.Composite;
 
@@ -140,29 +137,6 @@
       }
    }
 
-   public static class XOperationalImpactWithWorkaroundXWidgetWorkItem extends WorkWidgetDefinition {
-
-      public XOperationalImpactWithWorkaroundXWidgetWorkItem() {
-         super("Operational Impact - " + ID, ID);
-         DynamicXWidgetLayoutData data = new DynamicXWidgetLayoutData(null, XOption.NOT_REQUIRED);
-         data.setName("Operational Impact");
-         data.setStoreName(getId());
-         data.setXWidgetName(WIDGET_NAME);
-         set(data);
-      }
-   }
-   public static class XOperationalImpactWithWorkaroundRequiredXWidgetWorkItem extends WorkWidgetDefinition {
-
-      public XOperationalImpactWithWorkaroundRequiredXWidgetWorkItem() {
-         super("Operational Impact - " + ID_REQUIRED, ID_REQUIRED);
-         DynamicXWidgetLayoutData data = new DynamicXWidgetLayoutData(null, XOption.REQUIRED);
-         data.setName("Operational Impact");
-         data.setStoreName(getId());
-         data.setXWidgetName(WIDGET_NAME);
-         set(data);
-      }
-   }
-
    @Override
    protected void createControls(Composite parent, int horizontalSpan) {
       super.createControls(parent, horizontalSpan);
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/OperationalImpactXWidget.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/OperationalImpactXWidget.java
index 5e37676..f33182b 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/OperationalImpactXWidget.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/OperationalImpactXWidget.java
@@ -16,9 +16,6 @@
 import org.eclipse.osee.framework.ui.plugin.util.Result;
 import org.eclipse.osee.framework.ui.skynet.widgets.IArtifactWidget;
 import org.eclipse.osee.framework.ui.skynet.widgets.XComboWithText;
-import org.eclipse.osee.framework.ui.skynet.widgets.XOption;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.DynamicXWidgetLayoutData;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkWidgetDefinition;
 import org.eclipse.osee.framework.ui.swt.Widgets;
 import org.eclipse.swt.widgets.Composite;
 
@@ -97,30 +94,6 @@
       }
    }
 
-   public static class XOperationalImpactXWidgetWorkItem extends WorkWidgetDefinition {
-
-      public XOperationalImpactXWidgetWorkItem() {
-         super("Operational Impact - " + ID, ID);
-         DynamicXWidgetLayoutData data = new DynamicXWidgetLayoutData(null, XOption.NOT_REQUIRED);
-         data.setName("Operational Impact");
-         data.setStoreName(getId());
-         data.setXWidgetName(WIDGET_NAME);
-         set(data);
-      }
-   }
-
-   public static class XOperationalImpactRequiredXWidgetWorkItem extends WorkWidgetDefinition {
-
-      public XOperationalImpactRequiredXWidgetWorkItem() {
-         super("Operational Impact - " + ID_REQUIRED, ID_REQUIRED);
-         DynamicXWidgetLayoutData data = new DynamicXWidgetLayoutData(null, XOption.REQUIRED);
-         data.setName("Operational Impact");
-         data.setStoreName(getId());
-         data.setXWidgetName(WIDGET_NAME);
-         set(data);
-      }
-   }
-
    @Override
    protected void createControls(Composite parent, int horizontalSpan) {
       super.createControls(parent, horizontalSpan);
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/PriorityXWidget.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/PriorityXWidget.java
deleted file mode 100644
index 309f9b8..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/PriorityXWidget.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Created on Oct 29, 2010
- *
- * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE
- */
-package org.eclipse.osee.ats.column;
-
-import org.eclipse.osee.ats.artifact.AtsAttributeTypes;
-import org.eclipse.osee.ats.workflow.item.AtsAttributeSoleComboXWidgetWorkItem;
-import org.eclipse.osee.framework.ui.skynet.widgets.XOption;
-
-public class PriorityXWidget extends AtsAttributeSoleComboXWidgetWorkItem {
-
-   public PriorityXWidget() {
-      super(AtsAttributeTypes.PriorityType, "OPTIONS_FROM_ATTRIBUTE_VALIDITY", XOption.REQUIRED);
-   }
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsDatabaseConfig.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsDatabaseConfig.java
index 6ae4be8..a82607a 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsDatabaseConfig.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsDatabaseConfig.java
@@ -16,13 +16,6 @@
 import org.eclipse.osee.ats.artifact.AtsAttributeTypes;
 import org.eclipse.osee.ats.util.AtsUtil;
 import org.eclipse.osee.ats.workdef.AtsWorkDefinitionSheetProviders;
-import org.eclipse.osee.ats.workflow.flow.DecisionWorkflowDefinition;
-import org.eclipse.osee.ats.workflow.flow.GoalWorkflowDefinition;
-import org.eclipse.osee.ats.workflow.flow.PeerToPeerWorkflowDefinition;
-import org.eclipse.osee.ats.workflow.flow.SimpleWorkflowDefinition;
-import org.eclipse.osee.ats.workflow.flow.TaskWorkflowDefinition;
-import org.eclipse.osee.ats.workflow.flow.TeamWorkflowDefinition;
-import org.eclipse.osee.ats.workflow.item.AtsWorkDefinitions;
 import org.eclipse.osee.framework.core.data.IArtifactToken;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.core.model.Branch;
@@ -31,7 +24,6 @@
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
 import org.eclipse.osee.framework.ui.skynet.results.XResultData;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinition.WriteType;
 
 public class AtsDatabaseConfig implements IDbInitializationTask {
 
@@ -45,28 +37,9 @@
       topAi.setSoleAttributeValue(AtsAttributeTypes.Actionable, false);
       topAi.persist("Set Top AI to Non Actionable");
 
-      if (AtsUtil.dbInitWorkItemDefs()) {
-         configWorkItemDefinitions(WriteType.New, null);
-      }
-
       AtsUtil.getAtsAdminGroup().getGroupArtifact().persist();
    }
 
-   public static void configWorkItemDefinitions(WriteType writeType, XResultData xResultData) throws OseeCoreException {
-
-      // Import Work Item Definitions
-      AtsWorkDefinitions.importWorkItemDefinitionsIntoDb(writeType, xResultData,
-         AtsWorkDefinitions.getAtsWorkDefinitions());
-
-      new TeamWorkflowDefinition().config(writeType, xResultData);
-      new TaskWorkflowDefinition().config(writeType, xResultData);
-      new GoalWorkflowDefinition().config(writeType, xResultData);
-      new SimpleWorkflowDefinition().config(writeType, xResultData);
-      new DecisionWorkflowDefinition().config(writeType, xResultData);
-      new PeerToPeerWorkflowDefinition().config(writeType, xResultData);
-
-   }
-
    public static void createAtsFolders() throws OseeCoreException {
       Branch atsBranch = AtsUtil.getAtsBranch();
       SkynetTransaction transaction = new SkynetTransaction(atsBranch, "Create ATS Folders");
@@ -84,15 +57,6 @@
          headingArt.addChild(art);
          art.persist(transaction);
       }
-      if (AtsUtil.dbInitWorkItemDefs()) {
-         for (IArtifactToken token : Arrays.asList(AtsArtifactToken.WorkFlowsFolder, //
-            AtsArtifactToken.WorkPagesFolder, AtsArtifactToken.WorkWidgetsFolder, //
-            AtsArtifactToken.WorkRulesFolder)) {
-            Artifact art = OseeSystemArtifacts.getOrCreateArtifact(token, atsBranch);
-            headingArt.addChild(art);
-            art.persist(transaction);
-         }
-      }
       transaction.execute();
    }
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java
index edb576c..6ebc22f 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java
@@ -195,7 +195,6 @@
 
          new AtsNotificationNavigateItem(adminItems);
          new AtsNotificationNavigateItem(adminItems, true);
-         new UpdateAtsWorkItemDefinitions(adminItems);
          new DisplayCurrentOseeEventListeners(adminItems);
          new AtsRemoteEventTestItem(adminItems);
 
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ConfigureDBForAts.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ConfigureDBForAts.java
deleted file mode 100644
index 3028aa1..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ConfigureDBForAts.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.navigate;
-
-import java.util.logging.Level;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.osee.ats.internal.AtsPlugin;
-import org.eclipse.osee.ats.util.AtsUtil;
-import org.eclipse.osee.ats.workflow.item.AtsWorkDefinitions;
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.plugin.core.util.Jobs;
-import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption;
-import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem;
-import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinition.WriteType;
-import org.eclipse.osee.framework.ui.swt.Displays;
-
-/**
- * @author Donald G. Dunne
- */
-public class ConfigureDBForAts extends XNavigateItemAction {
-
-   private final String pluginId;
-
-   public ConfigureDBForAts(XNavigateItem parent, String pluginId) {
-      super(parent, "Admin - Configure DB For ATS");
-      this.pluginId = pluginId;
-   }
-
-   @Override
-   public void run(TableLoadOption... tableLoadOptions) {
-      if (!MessageDialog.openConfirm(Displays.getActiveShell(), "Configure DB for ATS",
-         "Configure DB for ATS " + pluginId)) {
-         return;
-      }
-      if (!MessageDialog.openConfirm(Displays.getActiveShell(), "Configure DB for ATS",
-         "This will break things really bad if ATS is alread configured for this item.  Are you sure?")) {
-         return;
-      }
-
-      Jobs.startJob(new Report(getName()), true);
-   }
-
-   public class Report extends Job {
-
-      public Report(String name) {
-         super(name);
-      }
-
-      @Override
-      protected IStatus run(IProgressMonitor monitor) {
-         try {
-            if (AtsUtil.dbInitWorkItemDefs()) {
-               monitor.subTask("Loading Work Item Definitions for " + pluginId);
-               AtsWorkDefinitions.importWorkItemDefinitionsIntoDb(WriteType.New, null,
-                  AtsWorkDefinitions.getAtsWorkDefinitions());
-               monitor.subTask("Loading Actionable Items and Teams for " + pluginId);
-            }
-         } catch (Exception ex) {
-            OseeLog.log(AtsPlugin.class, Level.SEVERE, ex);
-            return new Status(IStatus.ERROR, AtsPlugin.PLUGIN_ID, -1, ex.getMessage(), ex);
-         }
-         monitor.done();
-         return Status.OK_STATUS;
-      }
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/UpdateAtsWorkItemDefinitions.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/UpdateAtsWorkItemDefinitions.java
deleted file mode 100644
index 49acba3..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/UpdateAtsWorkItemDefinitions.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.navigate;
-
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.osee.ats.config.AtsDatabaseConfig;
-import org.eclipse.osee.ats.util.AtsUtil;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.ui.plugin.PluginUiImage;
-import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
-import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption;
-import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem;
-import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction;
-import org.eclipse.osee.framework.ui.skynet.results.XResultData;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinition.WriteType;
-import org.eclipse.osee.framework.ui.swt.Displays;
-
-/**
- * @author Donald G. Dunne
- */
-public class UpdateAtsWorkItemDefinitions extends XNavigateItemAction {
-
-   public UpdateAtsWorkItemDefinitions(XNavigateItem parent) {
-      super(parent, "Update Ats WorkItemDefinitions", PluginUiImage.ADMIN);
-   }
-
-   @Override
-   public void run(TableLoadOption... tableLoadOptions) throws OseeCoreException {
-      if (!MessageDialog.openConfirm(Displays.getActiveShell(), getName(), getName())) {
-         return;
-      }
-      if (!MessageDialog.openConfirm(Displays.getActiveShell(), getName(),
-         "This could break lots of things, are you SURE?")) {
-         return;
-      }
-
-      XResultData xResultData = new XResultData();
-      if (AtsUtil.dbInitWorkItemDefs()) {
-         AtsDatabaseConfig.configWorkItemDefinitions(WriteType.Update, xResultData);
-      }
-      if (xResultData.isEmpty()) {
-         xResultData.log("Nothing updated");
-      }
-      xResultData.report(getName());
-
-      AWorkbench.popup("Completed", getName());
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUtil.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUtil.java
index 25b3c8d..df4a4cc 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUtil.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUtil.java
@@ -98,7 +98,6 @@
       teamWorkflowArtifactTypesFilter, workItemArtifactTypesFilter;
    private static List<IEventFilter> atsObjectEventFilter = new ArrayList<IEventFilter>(2);
    public final static double DEFAULT_HOURS_PER_WORK_DAY = 8;
-   public final static boolean dbInitWorkItemDefs = false;
 
    private AtsUtil() {
       super();
@@ -504,10 +503,6 @@
       return StateManager.getAssigned(userId, clazz);
    }
 
-   public static boolean dbInitWorkItemDefs() {
-      return dbInitWorkItemDefs;
-   }
-
    public static Artifact getFromToken(IArtifactToken token) {
       Artifact toReturn = null;
       try {
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/SimpleTaskResolutionOptionsRule.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/SimpleTaskResolutionOptionsRule.java
index 5cc6348..77876b8 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/SimpleTaskResolutionOptionsRule.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/SimpleTaskResolutionOptionsRule.java
@@ -10,11 +10,6 @@
  *******************************************************************************/
 package org.eclipse.osee.ats.util.widgets.dialog;
 
-import org.eclipse.osee.ats.workflow.item.AtsWorkDefinitions;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.ui.skynet.results.XResultData;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinitionFactory;
-
 /**
  * @author Donald G. Dunne
  */
@@ -49,15 +44,4 @@
       //
       "</AtsTaskOptions>";
 
-   public SimpleTaskResolutionOptionsRule() {
-      super(ID, ID, resolutionOptionsXml);
-   }
-
-   public void config(WriteType writeType, XResultData xResultData) throws OseeCoreException {
-      AtsWorkDefinitions.importWorkItemDefinitionsIntoDb(writeType, xResultData, this);
-   }
-
-   public static void relatePageToRules(String pageId) throws OseeCoreException {
-      WorkItemDefinitionFactory.relateWorkItemDefinitions(pageId, ID);
-   }
 }
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TaskResolutionOptionRule.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TaskResolutionOptionRule.java
index 057a21f..8e4e617 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TaskResolutionOptionRule.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TaskResolutionOptionRule.java
@@ -22,13 +22,11 @@
 import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.core.exception.OseeExceptions;
-import org.eclipse.osee.framework.jdk.core.util.GUID;
 import org.eclipse.osee.framework.jdk.core.util.Strings;
 import org.eclipse.osee.framework.jdk.core.util.xml.Jaxp;
 import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkRuleDefinition;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
@@ -36,7 +34,7 @@
 /**
  * @author Donald G. Dunne
  */
-public class TaskResolutionOptionRule extends WorkRuleDefinition {
+public class TaskResolutionOptionRule {
 
    private final List<TaskResOptionDefinition> options = new ArrayList<TaskResOptionDefinition>();
    public final static String ATS_TASK_OPTIONS_TAG = "AtsTaskOptions";
@@ -44,16 +42,6 @@
    public final static List<TaskResOptionDefinition> EMPTY_TASK_RESOLUTION_OPTIONS =
       new ArrayList<TaskResOptionDefinition>();
 
-   public TaskResolutionOptionRule(String name, String id, String value) {
-      super(name, id, null, WORK_TYPE);
-      addWorkDataKeyValue(ATS_TASK_OPTIONS_TAG, value);
-   }
-
-   public TaskResolutionOptionRule(Artifact artifact) throws OseeCoreException {
-      super(artifact);
-      fromXml(artifact.getSoleAttributeValue(CoreAttributeTypes.WorkParentId, ""));
-   }
-
    public static List<TaskResOptionDefinition> getTaskResolutionOptions(StateDefinition stateDefinition) throws OseeCoreException {
       TaskResolutionOptionRule taskResolutionOptionRule = getTaskResolutionOptionRule(stateDefinition);
       if (taskResolutionOptionRule != null) {
@@ -74,7 +62,7 @@
       }
       RuleDefinition ruleDefinition = wids.iterator().next();
       if (ruleDefinition != null) {
-         TaskResolutionOptionRule taskResolutionOptionRule = new TaskResolutionOptionRule(null, GUID.create(), null);
+         TaskResolutionOptionRule taskResolutionOptionRule = new TaskResolutionOptionRule();
          taskResolutionOptionRule.fromXml(getTaskResolutionRuleXml(ruleDefinition));
          return taskResolutionOptionRule;
       }
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/WorkDefinitionFactory.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/WorkDefinitionFactory.java
index 3190a0f..0dfeae5 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/WorkDefinitionFactory.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/WorkDefinitionFactory.java
@@ -24,13 +24,9 @@
 import org.eclipse.osee.ats.util.widgets.DecisionOption;
 import org.eclipse.osee.ats.util.widgets.XDecisionOptions;
 import org.eclipse.osee.ats.workdef.provider.AtsWorkDefinitionProvider;
-import org.eclipse.osee.ats.workflow.flow.DecisionWorkflowDefinition;
-import org.eclipse.osee.ats.workflow.flow.GoalWorkflowDefinition;
-import org.eclipse.osee.ats.workflow.flow.PeerToPeerWorkflowDefinition;
-import org.eclipse.osee.ats.workflow.flow.TaskWorkflowDefinition;
 import org.eclipse.osee.ats.workflow.item.AtsAddDecisionReviewRule;
 import org.eclipse.osee.ats.workflow.item.AtsAddPeerToPeerReviewRule;
-import org.eclipse.osee.ats.workflow.item.AtsStatePercentCompleteWeightRule;
+import org.eclipse.osee.ats.workflow.item.AtsWorkDefinitions;
 import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
 import org.eclipse.osee.framework.core.exception.OseeArgumentException;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
@@ -56,6 +52,7 @@
    private static final Map<Artifact, WorkDefinitionMatch> artToWorkDefinitions =
       new HashMap<Artifact, WorkDefinitionMatch>();
    private static final Map<String, WorkDefinitionMatch> idToWorkDefintion = new HashMap<String, WorkDefinitionMatch>();
+   private static String AtsStatePercentCompleteWeightRule = "atsStatePercentCompleteWeight";
 
    public static RuleDefinition getRuleById(String id) {
       ensureRulesLoaded();
@@ -71,7 +68,7 @@
                      System.err.println("skipping rule " + workItem.getName());
                   } else if (workItem.getName().startsWith("atsAddPeerToPeerReview")) {
                      System.err.println("skipping rule " + workItem.getName());
-                  } else if (workItem.getName().startsWith(AtsStatePercentCompleteWeightRule.ID)) {
+                  } else if (workItem.getName().startsWith(AtsStatePercentCompleteWeightRule)) {
                      System.err.println("skipping rule " + workItem.getName());
                   } else {
                      try {
@@ -301,7 +298,7 @@
          // Process WeightDefinitions
          Artifact workDefArt = workFlowDef.getArtifact();
          for (Artifact workChild : workDefArt.getRelatedArtifacts(CoreRelationTypes.WorkItem__Child)) {
-            if (workChild.getName().startsWith(AtsStatePercentCompleteWeightRule.ID)) {
+            if (workChild.getName().startsWith(AtsStatePercentCompleteWeightRule)) {
                WorkRuleDefinition ruleDefinition = new WorkRuleDefinition(workChild);
                for (String stateName : ruleDefinition.getWorkDataKeyValueMap().keySet()) {
                   String value = ruleDefinition.getWorkDataValue(stateName);
@@ -474,12 +471,12 @@
       }
       if (!match.isMatched()) {
          // Else, use default Task workflow
-         String translatedId = getOverrideWorkDefId(TaskWorkflowDefinition.ID);
+         String translatedId = getOverrideWorkDefId(AtsWorkDefinitions.TaskWorkflowDefinitionId);
          match = getWorkDefinition(translatedId);
          if (match.isMatched()) {
             match.getTrace().add(
                String.format("default TaskWorkflowDefinition ID [%s] and override translated Id [%s]",
-                  TaskWorkflowDefinition.ID, translatedId));
+                  AtsWorkDefinitions.TaskWorkflowDefinitionId, translatedId));
          }
       }
       return match;
@@ -513,15 +510,18 @@
                      match = ((TeamWorkFlowArtifact) artifact).getTeamDefinition().getWorkDefinition();
                   }
                } else if (artifact.isOfType(AtsArtifactTypes.Goal)) {
-                  match = getWorkDefinition(getOverrideWorkDefId(GoalWorkflowDefinition.ID));
-                  match.getTrace().add(String.format("Override translated from id [%s]", GoalWorkflowDefinition.ID));
-               } else if (artifact instanceof PeerToPeerReviewArtifact) {
-                  match = getWorkDefinition(getOverrideWorkDefId(PeerToPeerWorkflowDefinition.ID));
+                  match = getWorkDefinition(getOverrideWorkDefId(AtsWorkDefinitions.GoalWorkflowDefinitionId));
                   match.getTrace().add(
-                     String.format("Override translated from id [%s]", PeerToPeerWorkflowDefinition.ID));
+                     String.format("Override translated from id [%s]", AtsWorkDefinitions.GoalWorkflowDefinitionId));
+               } else if (artifact instanceof PeerToPeerReviewArtifact) {
+                  match = getWorkDefinition(getOverrideWorkDefId(AtsWorkDefinitions.PeerToPeerWorkflowDefinitionId));
+                  match.getTrace().add(
+                     String.format("Override translated from id [%s]",
+                        AtsWorkDefinitions.PeerToPeerWorkflowDefinitionId));
                } else if (artifact instanceof DecisionReviewArtifact) {
-                  match = getWorkDefinition(getOverrideWorkDefId(DecisionWorkflowDefinition.ID));
-                  match.getTrace().add(String.format("Override translated from id [%s]", DecisionWorkflowDefinition.ID));
+                  match = getWorkDefinition(getOverrideWorkDefId(AtsWorkDefinitions.DecisionWorkflowDefinitionId));
+                  match.getTrace().add(
+                     String.format("Override translated from id [%s]", AtsWorkDefinitions.DecisionWorkflowDefinitionId));
                }
             }
          }
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/AtsWorkflowConfigEditor.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/AtsWorkflowConfigEditor.java
deleted file mode 100644
index 70f4cdd..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/AtsWorkflowConfigEditor.java
+++ /dev/null
@@ -1,416 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.editor;
-
-import java.util.Arrays;
-import java.util.EventObject;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gef.ContextMenuProvider;
-import org.eclipse.gef.DefaultEditDomain;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.GraphicalViewer;
-import org.eclipse.gef.dnd.TemplateTransferDragSourceListener;
-import org.eclipse.gef.dnd.TemplateTransferDropTargetListener;
-import org.eclipse.gef.editparts.ScalableFreeformRootEditPart;
-import org.eclipse.gef.palette.PaletteRoot;
-import org.eclipse.gef.requests.CreationFactory;
-import org.eclipse.gef.requests.SimpleFactory;
-import org.eclipse.gef.ui.actions.ActionRegistry;
-import org.eclipse.gef.ui.palette.PaletteViewer;
-import org.eclipse.gef.ui.palette.PaletteViewerProvider;
-import org.eclipse.gef.ui.parts.ContentOutlinePage;
-import org.eclipse.gef.ui.parts.GraphicalEditorWithFlyoutPalette;
-import org.eclipse.gef.ui.parts.GraphicalViewerKeyHandler;
-import org.eclipse.gef.ui.parts.TreeViewer;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.util.TransferDropTargetListener;
-import org.eclipse.osee.ats.help.ui.AtsHelpContext;
-import org.eclipse.osee.ats.internal.AtsPlugin;
-import org.eclipse.osee.ats.util.AtsUtil;
-import org.eclipse.osee.ats.workdef.StateDefinition;
-import org.eclipse.osee.ats.workdef.StateXWidgetPage;
-import org.eclipse.osee.ats.workdef.WorkDefinition;
-import org.eclipse.osee.ats.workflow.ATSXWidgetOptionResolver;
-import org.eclipse.osee.ats.workflow.editor.actions.EditAction;
-import org.eclipse.osee.ats.workflow.editor.model.CancelledWorkPageShape;
-import org.eclipse.osee.ats.workflow.editor.model.CompletedWorkPageShape;
-import org.eclipse.osee.ats.workflow.editor.model.DefaultTransitionConnection;
-import org.eclipse.osee.ats.workflow.editor.model.TransitionConnection;
-import org.eclipse.osee.ats.workflow.editor.model.WorkPageShape;
-import org.eclipse.osee.ats.workflow.editor.model.WorkflowDiagram;
-import org.eclipse.osee.ats.workflow.editor.parts.ShapesEditPartFactory;
-import org.eclipse.osee.ats.workflow.editor.parts.ShapesTreeEditPartFactory;
-import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
-import org.eclipse.osee.framework.core.exception.OseeArgumentException;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.logging.OseeLevel;
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
-import org.eclipse.osee.framework.skynet.core.event.filter.IEventFilter;
-import org.eclipse.osee.framework.skynet.core.event.listener.IArtifactEventListener;
-import org.eclipse.osee.framework.skynet.core.event.model.ArtifactEvent;
-import org.eclipse.osee.framework.skynet.core.event.model.EventModType;
-import org.eclipse.osee.framework.skynet.core.event.model.Sender;
-import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
-import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
-import org.eclipse.osee.framework.ui.plugin.util.HelpUtil;
-import org.eclipse.osee.framework.ui.plugin.util.Result;
-import org.eclipse.osee.framework.ui.swt.Displays;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.part.IPageSite;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-
-/**
- * A graphical editor for the configuration of ATS workflows<br>
- * 
- * @author Donald G. Dunne
- */
-public class AtsWorkflowConfigEditor extends GraphicalEditorWithFlyoutPalette implements IArtifactEventListener {
-
-   /** This is the root of the editor's model. */
-   private WorkflowDiagram diagram;
-   /** Palette component, holding the tools and shapes. */
-   private final PaletteRoot palletteModel;
-   public final static String EDITOR_ID = "org.eclipse.osee.ats.workflow.editor.AtsWorkflowConfigEditor";
-
-   /** Create a new ShapesEditor instance. This is called by the Workspace. */
-   public AtsWorkflowConfigEditor() {
-      setEditDomain(new DefaultEditDomain(this));
-      OseeEventManager.addListener(this);
-      palletteModel = AtsWorkflowConfigEditorPaletteFactory.createPalette(this);
-   }
-
-   /**
-    * Configure the graphical viewer before it receives contents.
-    * <p>
-    * This is the place to choose an appropriate RootEditPart and EditPartFactory for your editor. The RootEditPart
-    * determines the behavior of the editor's "work-area". For example, GEF includes zoomable and scrollable root edit
-    * parts. The EditPartFactory maps model elements to edit parts (controllers).
-    * </p>
-    * 
-    * @see org.eclipse.gef.ui.parts.GraphicalEditor#configureGraphicalViewer()
-    */
-   @Override
-   protected void configureGraphicalViewer() {
-      super.configureGraphicalViewer();
-
-      GraphicalViewer viewer = getGraphicalViewer();
-      viewer.setEditPartFactory(new ShapesEditPartFactory());
-      viewer.setRootEditPart(new ScalableFreeformRootEditPart());
-      viewer.setKeyHandler(new GraphicalViewerKeyHandler(viewer));
-
-      // configure the context menu provider
-      ContextMenuProvider cmProvider = new AtsWorkflowConfigEditorContextMenuProvider(viewer, getActionRegistry());
-      viewer.setContextMenu(cmProvider);
-      getSite().registerContextMenu(cmProvider, viewer);
-      HelpUtil.setHelp(viewer.getControl(), AtsHelpContext.CONFIGURE_WORKFLOW);
-
-   }
-
-   @Override
-   public void commandStackChanged(EventObject event) {
-      firePropertyChange(IEditorPart.PROP_DIRTY);
-      super.commandStackChanged(event);
-   }
-
-   @Override
-   protected PaletteViewerProvider createPaletteViewerProvider() {
-      return new PaletteViewerProvider(getEditDomain()) {
-         @Override
-         protected void configurePaletteViewer(PaletteViewer viewer) {
-            super.configurePaletteViewer(viewer);
-            // create a drag source listener for this palette viewer
-            // together with an appropriate transfer drop target listener, this will enable
-            // model element creation by dragging a CombinatedTemplateCreationEntries
-            // from the palette into the editor
-            // @see ShapesEditor#createTransferDropTargetListener()
-            viewer.addDragSourceListener(new TemplateTransferDragSourceListener(viewer));
-         }
-      };
-   }
-
-   /**
-    * Create a transfer drop target listener. When using a CombinedTemplateCreationEntry tool in the palette, this will
-    * enable model element creation by dragging from the palette.
-    * 
-    * @see #createPaletteViewerProvider()
-    */
-   private TransferDropTargetListener createTransferDropTargetListener() {
-      return new TemplateTransferDropTargetListener(getGraphicalViewer()) {
-         @Override
-         protected CreationFactory getFactory(Object template) {
-            return new SimpleFactory((Class<?>) template);
-         }
-      };
-   }
-
-   @Override
-   public void doSave(IProgressMonitor monitor) {
-      try {
-         SkynetTransaction transaction = new SkynetTransaction(AtsUtil.getAtsBranch(), "ATS Configuration Editor Save");
-         Result result = diagram.doSave(transaction);
-         if (result.isFalse()) {
-            AWorkbench.popup("Save Error", result.getText());
-            return;
-         }
-         transaction.execute();
-         //         diagram.getWorkFlowDefinition().loadPageData(true);
-         getCommandStack().markSaveLocation();
-
-      } catch (OseeCoreException ex) {
-         OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
-      }
-   }
-
-   @Override
-   public void doSaveAs() {
-      AWorkbench.popup("ERROR", "Not implemented yet");
-   }
-
-   @SuppressWarnings("rawtypes")
-   @Override
-   public Object getAdapter(Class type) {
-      if (type == IContentOutlinePage.class) {
-         return new ShapesOutlinePage(new TreeViewer());
-      }
-      return super.getAdapter(type);
-   }
-
-   WorkflowDiagram getModel() {
-      return diagram;
-   }
-
-   @Override
-   protected PaletteRoot getPaletteRoot() {
-      return palletteModel;
-   }
-
-   /**
-    * Set up the editor's inital content (after creation).
-    * 
-    * @see org.eclipse.gef.ui.parts.GraphicalEditorWithFlyoutPalette#initializeGraphicalViewer()
-    */
-   @Override
-   protected void initializeGraphicalViewer() {
-      super.initializeGraphicalViewer();
-      GraphicalViewer viewer = getGraphicalViewer();
-      viewer.setContents(getModel()); // set the contents of this editor
-
-      // listen for dropped parts
-      viewer.addDropTargetListener(createTransferDropTargetListener());
-      createActions();
-   }
-
-   @SuppressWarnings("unchecked")
-   @Override
-   protected void createActions() {
-      super.createActions();
-      ActionRegistry registry = getActionRegistry();
-      IAction action;
-
-      action = new EditAction();
-      registry.registerAction(action);
-      getStackActions().add(action.getId());
-   }
-
-   @Override
-   public boolean isSaveAsAllowed() {
-      return true;
-   }
-
-   @Override
-   protected void setInput(IEditorInput input) {
-      super.setInput(input);
-      if (input instanceof AtsWorkflowConfigEditorInput) {
-         AtsWorkflowConfigEditorInput editorInput = (AtsWorkflowConfigEditorInput) input;
-         WorkDefinition workflowDef = editorInput.workflow;
-         try {
-            setPartName(workflowDef.getName());
-            diagram = new WorkflowDiagram(workflowDef);
-            int yLoc = 0;
-            StateDefinition startPage = workflowDef.getStartState();
-            if (startPage == null || startPage.getName().equals("")) {
-               throw new OseeArgumentException("StartPage null for workflow [%s]", workflowDef);
-            }
-            // Create states
-            List<StateDefinition> pages = workflowDef.getStatesOrdered();
-            for (StateDefinition page : workflowDef.getStates()) {
-               if (!pages.contains(page)) {
-                  pages.add(page);
-               }
-            }
-            for (StateDefinition pageDef : pages) {
-               WorkPageShape pageShape = null;
-               if (pageDef.isCancelledPage()) {
-                  pageShape = new CancelledWorkPageShape(pageDef);
-                  pageShape.setLocation(new Point(250, 300));
-               } else if (pageDef.isCompletedPage()) {
-                  pageShape = new CompletedWorkPageShape(pageDef);
-                  pageShape.setLocation(new Point(50, yLoc += 90));
-               } else {
-                  pageShape = new WorkPageShape(pageDef);
-                  pageShape.setLocation(new Point(50, yLoc += 90));
-               }
-               pageShape.setStartPage(startPage.getName().equals(pageShape.getId()) || pageShape.getId().endsWith(
-                  startPage.getName()));
-               diagram.addChild(pageShape);
-            }
-
-            // Create transitions
-            createTransitions(workflowDef);
-         } catch (OseeCoreException ex) {
-            OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
-         }
-
-      } else {
-         throw new IllegalStateException("Invalid editor input");
-      }
-
-   }
-
-   @SuppressWarnings("unused")
-   private void createTransitions(WorkDefinition workflowDef) throws OseeCoreException {
-      for (StateDefinition workPageDefinition : workflowDef.getStatesOrdered()) {
-         WorkPageShape pageShape = getWorkPageShape(workPageDefinition);
-         StateXWidgetPage statePage =
-            new StateXWidgetPage(workflowDef, workPageDefinition, null, ATSXWidgetOptionResolver.getInstance());
-         // Handle to pages
-         Set<StateDefinition> toPages = new HashSet<StateDefinition>();
-         toPages.addAll(statePage.getToPages());
-         for (StateDefinition toPageDef : toPages) {
-            WorkPageShape toPageShape = getWorkPageShape(toPageDef);
-            if (toPageDef.equals(statePage.getDefaultToPage())) {
-               new DefaultTransitionConnection(pageShape, toPageShape);
-               //                  System.out.println("Default: " + statePage.getName() + " -> " + toPageShape.getName());
-            } else {
-               new TransitionConnection(pageShape, toPageShape);
-               //                  System.out.println("To: " + statePage.getName() + " -> " + toPageShape.getName());
-            }
-         }
-         // Handle return pages
-         //         for (StateDefinition toPageDef : returnPages) {
-         //            WorkPageShape toPageShape = getWorkPageShape(toPageDef);
-         //            new ReturnTransitionConnection(pageShape, toPageShape);
-         //            //               System.out.println("Return: " + statePage.getName() + " -> " + toPageShape.getName());
-         //         }
-      }
-   }
-
-   private WorkPageShape getWorkPageShape(StateDefinition page) {
-      for (Object object : getModel().getChildren()) {
-         if (object instanceof WorkPageShape && (((WorkPageShape) object).getId().equals(page.getName()) || page.getName() != null && ((WorkPageShape) object).getId().equals(
-            page.getName()))) {
-            return (WorkPageShape) object;
-         }
-      }
-      return null;
-   }
-   /**
-    * Creates an outline pagebook for this editor.
-    */
-   public class ShapesOutlinePage extends ContentOutlinePage {
-      /**
-       * Create a new outline page for the shapes editor.
-       * 
-       * @param viewer a viewer (TreeViewer instance) used for this outline page
-       * @throws OseeArgumentException if editor is null
-       */
-      public ShapesOutlinePage(EditPartViewer viewer) {
-         super(viewer);
-      }
-
-      @Override
-      public void createControl(Composite parent) {
-         // create outline viewer page
-         getViewer().createControl(parent);
-         // configure outline viewer
-         getViewer().setEditDomain(getEditDomain());
-         getViewer().setEditPartFactory(new ShapesTreeEditPartFactory());
-         // configure & add context menu to viewer
-         ContextMenuProvider cmProvider =
-            new AtsWorkflowConfigEditorContextMenuProvider(getViewer(), getActionRegistry());
-         getViewer().setContextMenu(cmProvider);
-         getSite().registerContextMenu("org.eclipse.osee.ats.config.editor.contextmenu", cmProvider,
-            getSite().getSelectionProvider());
-         // hook outline viewer
-         getSelectionSynchronizer().addViewer(getViewer());
-         // initialize outline viewer with model
-         getViewer().setContents(getModel());
-         // show outline viewer
-      }
-
-      @Override
-      public void dispose() {
-         // unhook outline viewer
-         getSelectionSynchronizer().removeViewer(getViewer());
-         // dispose
-         super.dispose();
-      }
-
-      @Override
-      public Control getControl() {
-         return getViewer().getControl();
-      }
-
-      /**
-       * @see org.eclipse.ui.part.IPageBookViewPage#init(org.eclipse.ui.part.IPageSite)
-       */
-      @Override
-      public void init(IPageSite pageSite) {
-         super.init(pageSite);
-         ActionRegistry registry = getActionRegistry();
-         IActionBars bars = pageSite.getActionBars();
-         String id = ActionFactory.UNDO.getId();
-         bars.setGlobalActionHandler(id, registry.getAction(id));
-         id = ActionFactory.REDO.getId();
-         bars.setGlobalActionHandler(id, registry.getAction(id));
-         id = ActionFactory.DELETE.getId();
-         bars.setGlobalActionHandler(id, registry.getAction(id));
-      }
-   }
-
-   public void closeEditor() {
-      final IEditorPart editor = this;
-      Displays.ensureInDisplayThread(new Runnable() {
-         @Override
-         public void run() {
-            if (AWorkbench.getActivePage() != null) {
-               AWorkbench.getActivePage().closeEditor(editor, false);
-            }
-         }
-      });
-   }
-
-   @Override
-   public List<? extends IEventFilter> getEventFilters() {
-      return Arrays.asList(OseeEventManager.getCommonBranchFilter(), AtsUtil.getWorkItemArtifactTypeEventFilter());
-   }
-
-   @Override
-   public void handleArtifactEvent(ArtifactEvent artifactEvent, Sender sender) {
-      for (Artifact delArt : artifactEvent.getCacheArtifacts(EventModType.Deleted)) {
-         if (delArt.isOfType(CoreArtifactTypes.WorkFlowDefinition) && delArt.getName().equals(getPartName())) {
-            closeEditor();
-         }
-      }
-   }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/AtsWorkflowConfigEditorActionBarContributor.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/AtsWorkflowConfigEditorActionBarContributor.java
deleted file mode 100644
index e372196..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/AtsWorkflowConfigEditorActionBarContributor.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.editor;
-
-import org.eclipse.gef.ui.actions.ActionBarContributor;
-import org.eclipse.gef.ui.actions.DeleteRetargetAction;
-import org.eclipse.gef.ui.actions.RedoRetargetAction;
-import org.eclipse.gef.ui.actions.UndoRetargetAction;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.ui.actions.ActionFactory;
-
-/**
- * Contributes actions to a toolbar. This class is tied to the editor in the definition of editor-extension (see
- * plugin.xml).
- * 
- * @author Donald G. Dunne
- */
-public class AtsWorkflowConfigEditorActionBarContributor extends ActionBarContributor {
-
-   /**
-    * Create actions managed by this contributor.
-    * 
-    * @see org.eclipse.gef.ui.actions.ActionBarContributor#buildActions()
-    */
-   @Override
-   protected void buildActions() {
-      addRetargetAction(new DeleteRetargetAction());
-      addRetargetAction(new UndoRetargetAction());
-      addRetargetAction(new RedoRetargetAction());
-   }
-
-   /**
-    * Add actions to the given toolbar.
-    * 
-    * @see org.eclipse.ui.part.EditorActionBarContributor#contributeToToolBar(org.eclipse.jface.action.IToolBarManager)
-    */
-   @Override
-   public void contributeToToolBar(IToolBarManager toolBarManager) {
-      toolBarManager.add(getAction(ActionFactory.UNDO.getId()));
-      toolBarManager.add(getAction(ActionFactory.REDO.getId()));
-   }
-
-   @Override
-   protected void declareGlobalActionKeys() {
-      // currently none
-   }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/AtsWorkflowConfigEditorContextMenuProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/AtsWorkflowConfigEditorContextMenuProvider.java
deleted file mode 100644
index dbf997c..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/AtsWorkflowConfigEditorContextMenuProvider.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.editor;
-
-import org.eclipse.gef.ContextMenuProvider;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.ui.actions.ActionRegistry;
-import org.eclipse.gef.ui.actions.GEFActionConstants;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.osee.ats.workflow.editor.actions.EditAction;
-import org.eclipse.osee.framework.core.exception.OseeArgumentException;
-import org.eclipse.ui.actions.ActionFactory;
-
-/**
- * Provides context menu actions for the ShapesEditor.
- * 
- * @author Donald G. Dunne
- */
-class AtsWorkflowConfigEditorContextMenuProvider extends ContextMenuProvider {
-
-   /** The editor's action registry. */
-   private final ActionRegistry actionRegistry;
-
-   /**
-    * Instantiate a new menu context provider for the specified EditPartViewer and ActionRegistry.
-    * 
-    * @param viewer the editor's graphical viewer
-    * @param registry the editor's action registry
-    * @throws OseeArgumentException if registry is <tt>null</tt>.
-    */
-   public AtsWorkflowConfigEditorContextMenuProvider(EditPartViewer viewer, ActionRegistry registry) {
-      super(viewer);
-      if (registry == null) {
-         throw new IllegalArgumentException();
-      }
-      actionRegistry = registry;
-   }
-
-   /**
-    * Called when the context menu is about to show. Actions, whose state is enabled, will appear in the context menu.
-    * 
-    * @see org.eclipse.gef.ContextMenuProvider#buildContextMenu(org.eclipse.jface.action.IMenuManager)
-    */
-   @Override
-   public void buildContextMenu(IMenuManager menu) {
-      // Add standard action groups to the menu
-      GEFActionConstants.addStandardActionGroups(menu);
-
-      // Add actions to the menu
-      menu.appendToGroup(GEFActionConstants.GROUP_EDIT, getAction(EditAction.ID));
-      menu.appendToGroup(GEFActionConstants.GROUP_UNDO, // target group id
-         getAction(ActionFactory.UNDO.getId())); // action to add
-      menu.appendToGroup(GEFActionConstants.GROUP_UNDO, getAction(ActionFactory.REDO.getId()));
-      menu.appendToGroup(GEFActionConstants.GROUP_EDIT, getAction(ActionFactory.DELETE.getId()));
-   }
-
-   private IAction getAction(String actionId) {
-      return actionRegistry.getAction(actionId);
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/AtsWorkflowConfigEditorInput.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/AtsWorkflowConfigEditorInput.java
deleted file mode 100644
index 0106a8b..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/AtsWorkflowConfigEditorInput.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.editor;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.osee.ats.workdef.WorkDefinition;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IPersistableElement;
-
-/**
- * @author Donald G. Dunne
- */
-public class AtsWorkflowConfigEditorInput implements IEditorInput {
-   protected WorkDefinition workflow;
-
-   public AtsWorkflowConfigEditorInput(WorkDefinition workflow) {
-      this.workflow = workflow;
-   }
-
-   @Override
-   public boolean equals(Object obj) {
-      if (obj instanceof AtsWorkflowConfigEditorInput) {
-         AtsWorkflowConfigEditorInput otherEdInput = (AtsWorkflowConfigEditorInput) obj;
-         return workflow.getName().equals(otherEdInput.workflow.getName());
-      }
-      return false;
-   }
-
-   @Override
-   public int hashCode() {
-      return workflow.getName().hashCode();
-   }
-
-   @Override
-   public boolean exists() {
-      return true;
-   }
-
-   @Override
-   public ImageDescriptor getImageDescriptor() {
-      return null;
-   }
-
-   @Override
-   public String getName() {
-      if (workflow == null) {
-         return "No Artifact Input Provided";
-      }
-      return workflow.getName();
-   }
-
-   @Override
-   public IPersistableElement getPersistable() {
-      return null;
-   }
-
-   @Override
-   public String getToolTipText() {
-      return getName();
-   }
-
-   @Override
-   @SuppressWarnings("rawtypes")
-   public Object getAdapter(Class adapter) {
-      return null;
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/AtsWorkflowConfigEditorPaletteFactory.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/AtsWorkflowConfigEditorPaletteFactory.java
deleted file mode 100644
index e71ab7f..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/AtsWorkflowConfigEditorPaletteFactory.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.editor;
-
-import org.eclipse.gef.Tool;
-import org.eclipse.gef.palette.CombinedTemplateCreationEntry;
-import org.eclipse.gef.palette.ConnectionCreationToolEntry;
-import org.eclipse.gef.palette.MarqueeToolEntry;
-import org.eclipse.gef.palette.PaletteContainer;
-import org.eclipse.gef.palette.PaletteDrawer;
-import org.eclipse.gef.palette.PaletteRoot;
-import org.eclipse.gef.palette.PaletteToolbar;
-import org.eclipse.gef.palette.PanningSelectionToolEntry;
-import org.eclipse.gef.palette.ToolEntry;
-import org.eclipse.gef.requests.CreationFactory;
-import org.eclipse.gef.requests.SimpleFactory;
-import org.eclipse.gef.tools.AbstractTool;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.osee.ats.AtsImage;
-import org.eclipse.osee.ats.internal.AtsPlugin;
-import org.eclipse.osee.ats.workflow.editor.actions.ValidateDiagramToolEntry;
-import org.eclipse.osee.ats.workflow.editor.model.CancelledWorkPageShape;
-import org.eclipse.osee.ats.workflow.editor.model.CompletedWorkPageShape;
-import org.eclipse.osee.ats.workflow.editor.model.DefaultTransitionConnection;
-import org.eclipse.osee.ats.workflow.editor.model.ReturnTransitionConnection;
-import org.eclipse.osee.ats.workflow.editor.model.TransitionConnection;
-import org.eclipse.osee.ats.workflow.editor.model.WorkPageShape;
-import org.eclipse.osee.framework.ui.plugin.OseeUiActions;
-import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
-import org.eclipse.osee.framework.ui.swt.Displays;
-import org.eclipse.osee.framework.ui.swt.ImageManager;
-
-/**
- * Utility class that can create a GEF Palette.
- * 
- * @see #createPalette()
- * @author Donald G. Dunne
- */
-final class AtsWorkflowConfigEditorPaletteFactory {
-
-   /** Create the "States" drawer. */
-   private static PaletteContainer createStatesDrawer() {
-      PaletteDrawer componentsDrawer = new PaletteDrawer("States");
-
-      CombinedTemplateCreationEntry component =
-         new CombinedTemplateCreationEntry("State", "Create a new Workflow State", WorkPageShape.class,
-            new SimpleFactory(WorkPageShape.class), ImageManager.getImageDescriptor(FrameworkImage.RECTANGLE_16),
-            ImageManager.getImageDescriptor(FrameworkImage.RECTANGLE_24));
-      componentsDrawer.add(component);
-
-      component =
-         new CombinedTemplateCreationEntry("Completed State", "Create a Completed State", CompletedWorkPageShape.class,
-            new SimpleFactory(CompletedWorkPageShape.class),
-            ImageManager.getImageDescriptor(FrameworkImage.RECTANGLE_16),
-            ImageManager.getImageDescriptor(FrameworkImage.RECTANGLE_24));
-      componentsDrawer.add(component);
-
-      component =
-         new CombinedTemplateCreationEntry("Cancelled State", "Create a Cancelled State", CancelledWorkPageShape.class,
-            new SimpleFactory(CancelledWorkPageShape.class),
-            ImageManager.getImageDescriptor(FrameworkImage.RECTANGLE_16),
-            ImageManager.getImageDescriptor(FrameworkImage.RECTANGLE_24));
-      componentsDrawer.add(component);
-
-      return componentsDrawer;
-   }
-
-   /** Create the "Transitions" drawer. */
-   private static PaletteContainer createTransitionsDrawer() {
-      PaletteDrawer componentsDrawer = new PaletteDrawer("Transitions");
-
-      ToolEntry tool =
-         new ConnectionCreationToolEntry("Default Transition", "Create a Default Transition", new CreationFactory() {
-            @Override
-            public Object getNewObject() {
-               return null;
-            }
-
-            @Override
-            public Object getObjectType() {
-               return DefaultTransitionConnection.class;
-            }
-         }, ImageManager.getImageDescriptor(AtsImage.CONECTION_16),
-            ImageManager.getImageDescriptor(AtsImage.CONECTION_24));
-      componentsDrawer.add(tool);
-
-      tool =
-         new ConnectionCreationToolEntry("Transition", "Create a Transition", new CreationFactory() {
-            @Override
-            public Object getNewObject() {
-               return null;
-            }
-
-            @Override
-            public Object getObjectType() {
-               return TransitionConnection.class;
-            }
-         }, ImageManager.getImageDescriptor(AtsImage.CONECTION_16),
-            ImageManager.getImageDescriptor(AtsImage.CONECTION_24));
-      componentsDrawer.add(tool);
-
-      tool =
-         new ConnectionCreationToolEntry("Return Transition", "Create a Return Transition", new CreationFactory() {
-            @Override
-            public Object getNewObject() {
-               return null;
-            }
-
-            @Override
-            public Object getObjectType() {
-               return ReturnTransitionConnection.class;
-            }
-         }, ImageManager.getImageDescriptor(AtsImage.CONECTION_16),
-            ImageManager.getImageDescriptor(AtsImage.CONECTION_24));
-      componentsDrawer.add(tool);
-
-      return componentsDrawer;
-   }
-
-   /**
-    * Creates the PaletteRoot and adds all palette elements. Use this factory method to create a new palette for your
-    * graphical editor.
-    * 
-    * @return a new PaletteRoot
-    */
-   static PaletteRoot createPalette(AtsWorkflowConfigEditor editor) {
-      PaletteRoot palette = new PaletteRoot();
-      palette.add(createToolsGroup(palette, editor));
-      palette.add(createStatesDrawer());
-      palette.add(createTransitionsDrawer());
-      return palette;
-   }
-
-   /** Create the "Tools" group. */
-   private static PaletteContainer createToolsGroup(PaletteRoot palette, AtsWorkflowConfigEditor editor) {
-      PaletteToolbar toolbar = new PaletteToolbar("Tools");
-
-      // Add a selection tool to the group
-      ToolEntry tool = new PanningSelectionToolEntry();
-      toolbar.add(tool);
-      palette.setDefaultEntry(tool);
-
-      // Add a marquee tool to the group
-      toolbar.add(new MarqueeToolEntry());
-
-      toolbar.add(new ValidateDiagramToolEntry());
-
-      final Action action =
-         OseeUiActions.createBugAction(AtsPlugin.PLUGIN_ID, editor, AtsWorkflowConfigEditor.EDITOR_ID,
-            "ATS Workflow Config Editor");
-      final ImageDescriptor img = action.getImageDescriptor();
-
-      toolbar.add(new ToolEntry("", action.getText(), img, img, null) {
-
-         @Override
-         public Tool createTool() {
-            return new AbstractTool() {
-
-               @Override
-               protected String getCommandName() {
-                  return action.getText();
-               }
-
-               @Override
-               public void activate() {
-                  super.activate();
-                  Displays.ensureInDisplayThread(new Runnable() {
-
-                     @Override
-                     public void run() {
-                        deactivate();
-                        action.run();
-                     }
-                  });
-
-               }
-            };
-         }
-
-      });
-
-      return toolbar;
-   }
-
-   /** Utility class. */
-   private AtsWorkflowConfigEditorPaletteFactory() {
-      // Utility class
-   }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/AtsWorkflowConfigRenderer.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/AtsWorkflowConfigRenderer.java
deleted file mode 100644
index 9e16931..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/AtsWorkflowConfigRenderer.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.editor;
-
-import static org.eclipse.osee.framework.ui.skynet.render.PresentationType.GENERALIZED_EDIT;
-import static org.eclipse.osee.framework.ui.skynet.render.PresentationType.PRODUCE_ATTRIBUTE;
-import java.util.ArrayList;
-import java.util.List;
-import org.eclipse.core.commands.Command;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.osee.ats.AtsImage;
-import org.eclipse.osee.ats.editor.AtsRenderer;
-import org.eclipse.osee.ats.internal.AtsPlugin;
-import org.eclipse.osee.ats.workdef.WorkDefinition;
-import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.logging.OseeLevel;
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.types.IArtifact;
-import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
-import org.eclipse.osee.framework.ui.skynet.render.PresentationType;
-import org.eclipse.osee.framework.ui.swt.Displays;
-import org.eclipse.osee.framework.ui.swt.ImageManager;
-import org.eclipse.ui.IEditorInput;
-
-/**
- * @author Donald G. Dunne
- */
-public class AtsWorkflowConfigRenderer extends AtsRenderer {
-
-   private static final String COMMAND_ID = "org.eclipse.osee.framework.ui.skynet.atsworkflowconfigeditor.command";
-
-   @Override
-   public ImageDescriptor getCommandImageDescriptor(Command command, Artifact artifact) {
-      return ImageManager.getImageDescriptor(AtsImage.WORKFLOW_CONFIG);
-   }
-
-   @Override
-   public String getName() {
-      return "ATS Workflow Config Editor";
-   }
-
-   @Override
-   public AtsWorkflowConfigRenderer newInstance() {
-      return new AtsWorkflowConfigRenderer();
-   }
-
-   @Override
-   public int getApplicabilityRating(PresentationType presentationType, IArtifact artifact) throws OseeCoreException {
-      if (artifact.getArtifactType().inheritsFrom(CoreArtifactTypes.WorkFlowDefinition) && !presentationType.matches(
-         GENERALIZED_EDIT, PRODUCE_ATTRIBUTE)) {
-         return PRESENTATION_SUBTYPE_MATCH;
-      }
-      return NO_MATCH;
-   }
-
-   @Override
-   public List<String> getCommandIds(CommandGroup commandGroup) {
-      ArrayList<String> commandIds = new ArrayList<String>(1);
-      if (commandGroup.isEdit()) {
-         commandIds.add(COMMAND_ID);
-      }
-      return commandIds;
-   }
-
-   @Override
-   public void open(final List<Artifact> artifacts, PresentationType presentationType) {
-      Displays.ensureInDisplayThread(new Runnable() {
-         @Override
-         public void run() {
-            try {
-               IEditorInput input = new AtsWorkflowConfigEditorInput(new WorkDefinition("This"));
-               AWorkbench.getActivePage().openEditor(input, AtsWorkflowConfigEditor.EDITOR_ID);
-            } catch (CoreException ex) {
-               OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
-            }
-         }
-      });
-   }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/actions/EditAction.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/actions/EditAction.java
deleted file mode 100644
index 2b7b209..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/actions/EditAction.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.editor.actions;
-
-import java.util.Iterator;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.osee.ats.internal.AtsPlugin;
-import org.eclipse.osee.ats.workdef.StateDefinition;
-import org.eclipse.osee.ats.workflow.editor.model.WorkPageShape;
-import org.eclipse.osee.ats.workflow.editor.model.WorkflowDiagram;
-import org.eclipse.osee.ats.workflow.editor.parts.DiagramEditPart;
-import org.eclipse.osee.ats.workflow.editor.parts.WorkPageEditPart;
-import org.eclipse.osee.framework.logging.OseeLevel;
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
-import org.eclipse.osee.framework.ui.skynet.render.PresentationType;
-import org.eclipse.osee.framework.ui.skynet.render.RendererManager;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinitionFactory;
-
-/**
- * @author Donald G. Dunne
- */
-public class EditAction extends Action {
-
-   public final static String ID = "osee.ats.workflowConfigEdit.edit";
-
-   public EditAction() {
-      super("Edit");
-   }
-
-   @Override
-   public String getId() {
-      return ID;
-   }
-
-   @Override
-   public void run() {
-      ISelectionProvider selectionProvider =
-         AWorkbench.getActivePage().getActivePart().getSite().getSelectionProvider();
-
-      if (selectionProvider != null && selectionProvider.getSelection() instanceof IStructuredSelection) {
-         IStructuredSelection structuredSelection = (IStructuredSelection) selectionProvider.getSelection();
-
-         try {
-            Iterator<?> i = structuredSelection.iterator();
-            while (i.hasNext()) {
-               Object obj = i.next();
-               if (obj instanceof DiagramEditPart && ((DiagramEditPart) obj).getModel() instanceof WorkflowDiagram) {
-                  WorkflowDiagram diagram = (WorkflowDiagram) ((DiagramEditPart) obj).getModel();
-                  //                  Artifact artifact = null;
-                  if (diagram.getWorkFlowDefinition() != null) {
-                     //                     WorkDefinition def = diagram.getWorkFlowDefinition();
-                     //                     artifact = WorkItemDefinitionFactory.getWorkItemDefinitionArtifact(def.getId());
-                  }
-                  //                  if (artifact != null) {
-                  //                     RendererManager.open(artifact, PresentationType.GENERALIZED_EDIT);
-                  //                     return;
-                  //                  }
-               }
-               if (obj instanceof WorkPageEditPart && ((WorkPageEditPart) obj).getModel() instanceof WorkPageShape) {
-                  WorkPageShape shape = (WorkPageShape) ((WorkPageEditPart) obj).getModel();
-                  Artifact artifact = null;
-                  if (shape.getWorkPageDefinition() != null) {
-                     StateDefinition def = shape.getWorkPageDefinition();
-                     artifact = WorkItemDefinitionFactory.getWorkItemDefinitionArtifact(def.getName());
-                  } else {
-                     String id = shape.getId();
-                     artifact = WorkItemDefinitionFactory.getWorkItemDefinitionArtifact(id);
-                     RendererManager.open(artifact, PresentationType.GENERALIZED_EDIT);
-                     return;
-                  }
-                  if (artifact != null) {
-                     RendererManager.open(artifact, PresentationType.GENERALIZED_EDIT);
-                     return;
-                  }
-               }
-            }
-            AWorkbench.popup("ERROR", "Can't locate corresponding artifact");
-         } catch (Exception ex) {
-            OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
-         }
-      }
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/actions/ValidateDiagramTool.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/actions/ValidateDiagramTool.java
deleted file mode 100644
index bf9dd64..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/actions/ValidateDiagramTool.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.editor.actions;
-
-import org.eclipse.draw2d.Cursors;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.editparts.ScalableFreeformRootEditPart;
-import org.eclipse.gef.tools.SelectionTool;
-import org.eclipse.osee.ats.internal.AtsPlugin;
-import org.eclipse.osee.ats.workflow.editor.model.ModelElement;
-import org.eclipse.osee.ats.workflow.editor.parts.DiagramEditPart;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.logging.OseeLevel;
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
-import org.eclipse.osee.framework.ui.plugin.util.Result;
-import org.eclipse.swt.events.MouseEvent;
-
-/**
- * @author Donald G. Dunne
- */
-public class ValidateDiagramTool extends SelectionTool {
-
-   public ValidateDiagramTool() {
-      setDefaultCursor(Cursors.ARROW);
-   }
-
-   @Override
-   public void mouseDown(MouseEvent e, EditPartViewer viewer) {
-      super.mouseDown(e, viewer);
-      try {
-         EditPart editPart = getTargetEditPart();
-         Object model = editPart.getModel();
-         if (editPart instanceof ScalableFreeformRootEditPart) {
-            EditPart ePart = ((ScalableFreeformRootEditPart) editPart).getContents();
-            if (ePart instanceof DiagramEditPart) {
-               model = ((DiagramEditPart) ePart).getModel();
-            }
-         }
-         if (model instanceof ModelElement) {
-            Result result = ((ModelElement) model).validForSave();
-            if (result.isFalse()) {
-               AWorkbench.popup("Validate Error", model + "\n\n" + "Error: " + result.getText());
-            } else {
-               AWorkbench.popup("Validate Success", model + "\n\n" + "Valid");
-            }
-         }
-      } catch (OseeCoreException ex) {
-         OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
-      }
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/actions/ValidateDiagramToolEntry.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/actions/ValidateDiagramToolEntry.java
deleted file mode 100644
index 97b0feb..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/actions/ValidateDiagramToolEntry.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.editor.actions;
-
-import org.eclipse.gef.palette.ToolEntry;
-import org.eclipse.osee.ats.AtsImage;
-import org.eclipse.osee.framework.ui.swt.ImageManager;
-
-/**
- * @author Donald G. Dunne
- */
-public class ValidateDiagramToolEntry extends ToolEntry {
-
-   public ValidateDiagramToolEntry() {
-      super("Validate Diagram", "Validate", ImageManager.getImageDescriptor(AtsImage.CHECK_BLUE),
-         ImageManager.getImageDescriptor(AtsImage.CHECK_BLUE), ValidateDiagramTool.class);
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/CancelledWorkPageShape.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/CancelledWorkPageShape.java
deleted file mode 100644
index f82e134..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/CancelledWorkPageShape.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.editor.model;
-
-import java.util.logging.Level;
-import org.eclipse.osee.ats.internal.AtsPlugin;
-import org.eclipse.osee.ats.workdef.StateDefinition;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.logging.OseeLog;
-
-/**
- * @author Donald G. Dunne
- */
-public class CancelledWorkPageShape extends WorkPageShape {
-
-   public CancelledWorkPageShape(StateDefinition workPageDefinition) {
-      super(workPageDefinition);
-   }
-
-   public CancelledWorkPageShape() {
-      //      super(new WorkPageDefinition("Cancelled", "NEW", AtsCancelledWorkPageDefinition.ID, WorkPageType.Cancelled, 3));
-      super(new StateDefinition("Cancelled"));
-   }
-
-   @Override
-   public boolean equals(Object obj) {
-      if (obj instanceof WorkPageShape) {
-         try {
-            return ((WorkPageShape) obj).isCancelledState();
-         } catch (OseeCoreException ex) {
-            OseeLog.log(AtsPlugin.class, Level.SEVERE, ex);
-         }
-      }
-      return super.equals(obj);
-   }
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/CompletedWorkPageShape.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/CompletedWorkPageShape.java
deleted file mode 100644
index 223feba..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/CompletedWorkPageShape.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.editor.model;
-
-import java.util.logging.Level;
-import org.eclipse.osee.ats.internal.AtsPlugin;
-import org.eclipse.osee.ats.workdef.StateDefinition;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.logging.OseeLog;
-
-/**
- * @author Donald G. Dunne
- */
-public class CompletedWorkPageShape extends WorkPageShape {
-
-   public CompletedWorkPageShape() {
-      //    super(new WorkPageDefinition("Completed", "NEW", AtsCompletedWorkPageDefinition.ID, WorkPageType.Completed, 2));
-      super(new StateDefinition("Completed"));
-   }
-
-   @Override
-   public boolean equals(Object obj) {
-      if (obj instanceof WorkPageShape) {
-         try {
-            return ((WorkPageShape) obj).isCompletedState();
-         } catch (OseeCoreException ex) {
-            OseeLog.log(AtsPlugin.class, Level.SEVERE, ex);
-         }
-      }
-      return super.equals(obj);
-   }
-
-   public CompletedWorkPageShape(StateDefinition workPageDefinition) {
-      super(workPageDefinition);
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/DefaultTransitionConnection.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/DefaultTransitionConnection.java
deleted file mode 100644
index 94ad6a7..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/DefaultTransitionConnection.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.editor.model;
-
-import org.eclipse.osee.framework.ui.swt.Displays;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @author Donald G. Dunne
- */
-public class DefaultTransitionConnection extends TransitionConnection {
-
-   public DefaultTransitionConnection(Shape source, Shape target) {
-      super(source, target);
-   }
-
-   @Override
-   public Color getForegroundColor() {
-      return Displays.getSystemColor(SWT.COLOR_DARK_GREEN);
-   }
-
-   @Override
-   public int getLineWidth() {
-      return 3;
-   }
-
-   @Override
-   public String getLabel() {
-      return "Default Transition";
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/EllipticalShape.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/EllipticalShape.java
deleted file mode 100644
index 2363d4b..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/EllipticalShape.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.editor.model;
-
-import org.eclipse.osee.ats.AtsImage;
-import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
-import org.eclipse.osee.framework.ui.plugin.util.Result;
-import org.eclipse.osee.framework.ui.swt.ImageManager;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * An elliptical shape.
- * 
- * @author Donald G. Dunne
- */
-public class EllipticalShape extends Shape {
-
-   /** A 16x16 pictogram of an elliptical shape. */
-
-   @Override
-   public Image getIcon() {
-      return ImageManager.getImage(AtsImage.ELLIPSE_ICON);
-   }
-
-   @Override
-   public Result validForSave() {
-      return Result.TrueResult;
-   }
-
-   @Override
-   public String toString() {
-      return "Ellipse " + hashCode();
-   }
-
-   @Override
-   protected String getName() {
-      return null;
-   }
-
-   @Override
-   protected String getToolTip() {
-      return null;
-   }
-
-   @Override
-   public Result doSave(SkynetTransaction transaction) {
-      return Result.TrueResult;
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/ModelElement.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/ModelElement.java
deleted file mode 100644
index facc5ea..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/ModelElement.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.editor.model;
-
-import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeSupport;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.util.HashMap;
-import java.util.Map;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
-import org.eclipse.osee.framework.ui.plugin.util.Result;
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.eclipse.ui.views.properties.IPropertySource;
-
-/**
- * Abstract prototype of a model element.
- * <p>
- * This class provides features necessary for all model elements, like:
- * </p>
- * <ul>
- * <li>property-change support (used to notify edit parts of model changes),</li>
- * <li>property-source support (used to display property values in the Property View) and</li>
- * <li>serialization support (the model hierarchy must be serializable, so that the editor can save and restore a binary
- * representation. You might not need this, if you store the model a non-binary form like XML).</li>
- * </ul>
- * 
- * @author Donald G. Dunne
- */
-public abstract class ModelElement implements IPropertySource {
-   /** An empty property descriptor. */
-   private static final IPropertyDescriptor[] EMPTY_ARRAY = new IPropertyDescriptor[0];
-
-   /** Delegate used to implement property-change-support. */
-   private transient PropertyChangeSupport pcsDelegate = new PropertyChangeSupport(this);
-   protected Map<Object, Object> propertyValues;
-
-   @SuppressWarnings("unused")
-   protected void initializePropertyValues() throws OseeCoreException {
-      if (propertyValues == null) {
-         propertyValues = new HashMap<Object, Object>();
-      }
-   }
-
-   public abstract Result doSave(SkynetTransaction transaction) throws OseeCoreException;
-
-   public abstract Result validForSave() throws OseeCoreException;
-
-   /**
-    * Attach a non-null PropertyChangeListener to this object.
-    * 
-    * @param l a non-null PropertyChangeListener instance
-    * @throws IllegalArgumentException if the parameter is null
-    */
-   public synchronized void addPropertyChangeListener(PropertyChangeListener l) {
-      if (l == null) {
-         throw new IllegalArgumentException();
-      }
-      pcsDelegate.addPropertyChangeListener(l);
-   }
-
-   /**
-    * Report a property change to registered listeners (for example edit parts).
-    * 
-    * @param property the programmatic name of the property that changed
-    * @param oldValue the old value of this property
-    * @param newValue the new value of this property
-    */
-   protected void firePropertyChange(String property, Object oldValue, Object newValue) {
-      if (pcsDelegate.hasListeners(property)) {
-         pcsDelegate.firePropertyChange(property, oldValue, newValue);
-      }
-   }
-
-   /**
-    * Returns a value for this property source that can be edited in a property sheet.
-    * <p>
-    * My personal rule of thumb:
-    * </p>
-    * <ul>
-    * <li>model elements should return themselves and</li>
-    * <li>custom IPropertySource implementations (like DimensionPropertySource in the GEF-logic example) should return
-    * an editable value.</li>
-    * </ul>
-    * <p>
-    * Override only if necessary.
-    * </p>
-    * 
-    * @return this instance
-    */
-   @Override
-   public Object getEditableValue() {
-      return this;
-   }
-
-   /**
-    * Children should override this. The default implementation returns an empty array.
-    */
-   @Override
-   public IPropertyDescriptor[] getPropertyDescriptors() {
-      return EMPTY_ARRAY;
-   }
-
-   /**
-    * Children should override this. The default implementation returns null.
-    */
-   @Override
-   public Object getPropertyValue(Object id) {
-      return propertyValues.get(id);
-   }
-
-   /**
-    * Children should override this. The default implementation returns false.
-    */
-   @Override
-   public boolean isPropertySet(Object id) {
-      return false;
-   }
-
-   /**
-    * Deserialization constructor. Initializes transient fields.
-    * 
-    * @see java.io.Serializable
-    */
-   private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
-      in.defaultReadObject();
-      pcsDelegate = new PropertyChangeSupport(this);
-   }
-
-   /**
-    * Remove a PropertyChangeListener from this component.
-    * 
-    * @param l a PropertyChangeListener instance
-    */
-   public synchronized void removePropertyChangeListener(PropertyChangeListener l) {
-      if (l != null) {
-         pcsDelegate.removePropertyChangeListener(l);
-      }
-   }
-
-   /**
-    * Children should override this. The default implementation does nothing.
-    */
-   @Override
-   public void resetPropertyValue(Object id) {
-      // do nothing
-   }
-
-   /**
-    * Children should override this. The default implementation does nothing.
-    */
-   @Override
-   public void setPropertyValue(Object id, Object value) {
-      propertyValues.put(id, value);
-   }
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/RectangleShape.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/RectangleShape.java
deleted file mode 100644
index 176ce10..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/RectangleShape.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.editor.model;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
-import org.eclipse.osee.framework.ui.plugin.util.Result;
-import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
-import org.eclipse.osee.framework.ui.swt.ImageManager;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * A rectangular shape.
- * 
- * @author Donald G. Dunne
- */
-public class RectangleShape extends Shape {
-   /** A 16x16 pictogram of a rectangular shape. */
-
-   public RectangleShape() {
-      setSize(new Dimension(100, 50));
-   }
-
-   @SuppressWarnings("unused")
-   @Override
-   public Result validForSave() throws OseeCoreException {
-      return Result.TrueResult;
-   }
-
-   @Override
-   public Image getIcon() {
-      return ImageManager.getImage(FrameworkImage.RECTANGLE_16);
-   }
-
-   @Override
-   protected String getName() {
-      return null;
-   }
-
-   @Override
-   protected String getToolTip() {
-      return null;
-   }
-
-   @SuppressWarnings("unused")
-   @Override
-   public Result doSave(SkynetTransaction transaction) throws OseeCoreException {
-      return Result.TrueResult;
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/Relation.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/Relation.java
deleted file mode 100644
index ae73191..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/Relation.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.editor.model;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
-import org.eclipse.osee.framework.ui.plugin.util.Result;
-import org.eclipse.osee.framework.ui.swt.Displays;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * A connection between two distinct shapes.
- * 
- * @author Donald G. Dunne
- */
-public class Relation extends ModelElement {
-
-   /** True, if the connection is attached to its endpoints. */
-   private boolean isConnected;
-   private int lineStyle = Graphics.LINE_SOLID;
-   /** Relation's source endpoint. */
-   private Shape source;
-   /** Relation's target endpoint. */
-   private Shape target;
-
-   /**
-    * Create a (solid) connection between two distinct shapes.
-    * 
-    * @param source a source endpoint for this connection (non null)
-    * @param target a target endpoint for this connection (non null)
-    * @throws IllegalArgumentException if any of the parameters are null or source == target
-    * @see #setLineStyle(int)
-    */
-   public Relation(Shape source, Shape target) {
-      reconnect(source, target);
-   }
-
-   public Color getForegroundColor() {
-      return Displays.getSystemColor(SWT.COLOR_BLACK);
-   }
-
-   @Override
-   public String toString() {
-      return "Relation";
-   }
-
-   /**
-    * Disconnect this connection from the shapes it is attached to.
-    */
-   public void disconnect() {
-      if (isConnected) {
-         source.removeConnection(this);
-         target.removeConnection(this);
-         isConnected = false;
-      }
-   }
-
-   /**
-    * Returns the line drawing style of this connection.
-    * 
-    * @return an int value (Graphics.LINE_DASH or Graphics.LINE_SOLID)
-    */
-   public int getLineStyle() {
-      return lineStyle;
-   }
-
-   @SuppressWarnings("unused")
-   @Override
-   public Result validForSave() throws OseeCoreException {
-      return Result.TrueResult;
-   }
-
-   /**
-    * Returns the source end-point of this connection.
-    * 
-    * @return a non-null Shape instance
-    */
-   public Shape getSource() {
-      return source;
-   }
-
-   /**
-    * Returns the target endpoint of this connection.
-    * 
-    * @return a non-null Shape instance
-    */
-   public Shape getTarget() {
-      return target;
-   }
-
-   /**
-    * Reconnect this connection. The connection will reconnect with the shapes it was previously attached to.
-    */
-   public void reconnect() {
-      if (!isConnected) {
-         source.addConnection(this);
-         target.addConnection(this);
-         isConnected = true;
-      }
-   }
-
-   /**
-    * Reconnect to a different source and/or target shape. The connection will disconnect from its current attachments
-    * and reconnect to the new source and target.
-    * 
-    * @param newSource a new source endpoint for this connection (non null)
-    * @param newTarget a new target endpoint for this connection (non null)
-    * @throws IllegalArgumentException if any of the paramers are null or newSource == newTarget
-    */
-   public void reconnect(Shape newSource, Shape newTarget) {
-      if (newSource == null || newTarget == null || newSource.equals(newTarget)) {
-         throw new IllegalArgumentException();
-      }
-      disconnect();
-      this.source = newSource;
-      this.target = newTarget;
-      reconnect();
-   }
-
-   /**
-    * Set the line drawing style of this connection.
-    * 
-    * @param lineStyle one of following values: Graphics.LINE_DASH or Graphics.LINE_SOLID
-    * @see Graphics#LINE_DASH
-    * @see Graphics#LINE_SOLID
-    * @throws IllegalArgumentException if lineStyle does not have one of the above values
-    */
-   public void setLineStyle(int lineStyle) {
-      if (lineStyle != Graphics.LINE_DASH && lineStyle != Graphics.LINE_SOLID) {
-         throw new IllegalArgumentException();
-      }
-      this.lineStyle = lineStyle;
-   }
-
-   /**
-    * @return the label
-    */
-   public String getLabel() {
-      return "Relation";
-   }
-
-   /**
-    * @return the lineWidth
-    */
-   public int getLineWidth() {
-      return 2;
-   }
-
-   @SuppressWarnings("unused")
-   @Override
-   public Result doSave(SkynetTransaction transaction) throws OseeCoreException {
-      return Result.TrueResult;
-   }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/ReturnTransitionConnection.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/ReturnTransitionConnection.java
deleted file mode 100644
index db8b975..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/ReturnTransitionConnection.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.editor.model;
-
-import org.eclipse.draw2d.Graphics;
-
-/**
- * @author Donald G. Dunne
- */
-public class ReturnTransitionConnection extends TransitionConnection {
-
-   public ReturnTransitionConnection(Shape source, Shape target) {
-      super(source, target);
-   }
-
-   @Override
-   public int getLineStyle() {
-      return Graphics.LINE_DASH;
-   }
-
-   @Override
-   public String getLabel() {
-      return "Return Transition";
-   }
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/Shape.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/Shape.java
deleted file mode 100644
index 8ec6522..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/Shape.java
+++ /dev/null
@@ -1,291 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.editor.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.eclipse.ui.views.properties.PropertyDescriptor;
-import org.eclipse.ui.views.properties.TextPropertyDescriptor;
-
-/**
- * Abstract prototype of a shape. Has a size (width and height), a location (x and y position) and a list of incoming
- * and outgoing connections. Use subclasses to instantiate a specific shape.
- * 
- * @see org.eclipse.osee.ats.workflow.editor.model.WorkPageShape
- * @see org.eclipse.osee.ats.workflow.editor.model.EllipticalShape
- * @author Donald G. Dunne
- */
-public abstract class Shape extends ModelElement {
-
-   /**
-    * A static array of property descriptors. There is one IPropertyDescriptor entry per editable property.
-    * 
-    * @see #getPropertyDescriptors()
-    * @see #getPropertyValue(Object)
-    * @see #setPropertyValue(Object, Object)
-    */
-   private IPropertyDescriptor[] descriptors;
-   private final List<IPropertyDescriptor> descriptorList = new ArrayList<IPropertyDescriptor>();
-   /** ID for the Height property value (used for by the corresponding property descriptor). */
-   private static final String HEIGHT_PROP = "Shape.Height";
-   /** Property ID to use when the location of this shape is modified. */
-   public static final String LOCATION_PROP = "Shape.Location";
-   private static final long serialVersionUID = 1;
-   /** Property ID to use then the size of this shape is modified. */
-   public static final String SIZE_PROP = "Shape.Size";
-   /** Property ID to use when the list of outgoing connections is modified. */
-   public static final String SOURCE_CONNECTIONS_PROP = "Shape.SourceConn";
-   /** Property ID to use when the list of incoming connections is modified. */
-   public static final String TARGET_CONNECTIONS_PROP = "Shape.TargetConn";
-   /** ID for the Width property value (used for by the corresponding property descriptor). */
-   private static final String WIDTH_PROP = "Shape.Width";
-
-   /** ID for the X property value (used for by the corresponding property descriptor). */
-   private static final String XPOS_PROP = "Shape.xPos";
-   /** ID for the Y property value (used for by the corresponding property descriptor). */
-   private static final String YPOS_PROP = "Shape.yPos";
-
-   protected abstract String getName();
-
-   protected abstract String getToolTip();
-
-   /** Location of this shape. */
-   private final Point location = new Point(0, 0);
-   /** Size of this shape. */
-   private final Dimension size = new Dimension(50, 50);
-   /** List of outgoing Connections. */
-   private final List<Relation> sourceConnections = new ArrayList<Relation>();
-   /** List of incoming Connections. */
-   private final List<Relation> targetConnections = new ArrayList<Relation>();
-   private WorkflowDiagram workflowDiagram;
-
-   /**
-    * Add an incoming or outgoing connection to this shape.
-    * 
-    * @param conn a non-null connection instance
-    * @throws IllegalArgumentException if the connection is null or has not distinct endpoints
-    */
-   void addConnection(Relation conn) {
-      if (conn == null || conn.getSource() == conn.getTarget()) {
-         throw new IllegalArgumentException();
-      }
-      if (conn.getSource() == this) {
-         sourceConnections.add(conn);
-         firePropertyChange(SOURCE_CONNECTIONS_PROP, null, conn);
-      } else if (conn.getTarget() == this) {
-         targetConnections.add(conn);
-         firePropertyChange(TARGET_CONNECTIONS_PROP, null, conn);
-      }
-   }
-
-   /**
-    * Return a pictogram (small icon) describing this model element. Children should override this method and return an
-    * appropriate Image.
-    * 
-    * @return a 16x16 Image or null
-    */
-   public abstract Image getIcon();
-
-   /**
-    * Return the Location of this shape.
-    * 
-    * @return a non-null location instance
-    */
-   public Point getLocation() {
-      return location.getCopy();
-   }
-
-   /**
-    * Returns an array of IPropertyDescriptors for this shape.
-    * <p>
-    * The returned array is used to fill the property view, when the edit-part corresponding to this model element is
-    * selected.
-    * </p>
-    * 
-    * @see #descriptors
-    * @see #getPropertyValue(Object)
-    * @see #setPropertyValue(Object, Object)
-    */
-   @Override
-   public IPropertyDescriptor[] getPropertyDescriptors() {
-      if (descriptors == null) {
-         initializePropertyDescriptors(descriptorList);
-         descriptors = descriptorList.toArray(new IPropertyDescriptor[descriptorList.size()]);
-      }
-      return descriptors;
-   }
-
-   protected void initializePropertyDescriptors(List<IPropertyDescriptor> descriptorList) {
-      descriptorList.add(new TextPropertyDescriptor(XPOS_PROP, "X")); // id and description pair
-      descriptorList.add(new TextPropertyDescriptor(YPOS_PROP, "Y"));
-      descriptorList.add(new TextPropertyDescriptor(WIDTH_PROP, "Width"));
-      descriptorList.add(new TextPropertyDescriptor(HEIGHT_PROP, "Height"));
-      // use a custom cell editor validator for all four array entries
-      for (IPropertyDescriptor descriptor : descriptorList) {
-         ((PropertyDescriptor) descriptor).setValidator(new ICellEditorValidator() {
-            @Override
-            public String isValid(Object value) {
-               int intValue = -1;
-               try {
-                  intValue = Integer.parseInt((String) value);
-               } catch (NumberFormatException exc) {
-                  return "Not a number";
-               }
-               return intValue >= 0 ? null : "Value must be >=  0";
-            }
-         });
-      }
-   }
-
-   /**
-    * Return the property value for the given propertyId, or null.
-    * <p>
-    * The property view uses the IDs from the IPropertyDescriptors array to obtain the value of the corresponding
-    * properties.
-    * </p>
-    * 
-    * @see #descriptors
-    * @see #getPropertyDescriptors()
-    */
-   @Override
-   public Object getPropertyValue(Object propertyId) {
-      if (XPOS_PROP.equals(propertyId)) {
-         return Integer.toString(location.x);
-      }
-      if (YPOS_PROP.equals(propertyId)) {
-         return Integer.toString(location.y);
-      }
-      if (HEIGHT_PROP.equals(propertyId)) {
-         return Integer.toString(size.height);
-      }
-      if (WIDTH_PROP.equals(propertyId)) {
-         return Integer.toString(size.width);
-      }
-      return super.getPropertyValue(propertyId);
-   }
-
-   /**
-    * Return the Size of this shape.
-    * 
-    * @return a non-null Dimension instance
-    */
-   public Dimension getSize() {
-      return size.getCopy();
-   }
-
-   /**
-    * Return a List of outgoing Connections.
-    */
-   public List<Relation> getSourceConnections() {
-      return new ArrayList<Relation>(sourceConnections);
-   }
-
-   /**
-    * Return a List of incoming Connections.
-    */
-   public List<Relation> getTargetConnections() {
-      return new ArrayList<Relation>(targetConnections);
-   }
-
-   /**
-    * Remove an incoming or outgoing connection from this shape.
-    * 
-    * @param conn a non-null connection instance
-    * @throws IllegalArgumentException if the parameter is null
-    */
-   void removeConnection(Relation conn) {
-      if (conn == null) {
-         throw new IllegalArgumentException();
-      }
-      if (conn.getSource() == this) {
-         sourceConnections.remove(conn);
-         firePropertyChange(SOURCE_CONNECTIONS_PROP, null, conn);
-      } else if (conn.getTarget() == this) {
-         targetConnections.remove(conn);
-         firePropertyChange(TARGET_CONNECTIONS_PROP, null, conn);
-      }
-   }
-
-   /**
-    * Set the Location of this shape.
-    * 
-    * @param newLocation a non-null Point instance
-    * @throws IllegalArgumentException if the parameter is null
-    */
-   public void setLocation(Point newLocation) {
-      if (newLocation == null) {
-         throw new IllegalArgumentException();
-      }
-      location.setLocation(newLocation);
-      firePropertyChange(LOCATION_PROP, null, location);
-   }
-
-   /**
-    * Set the property value for the given property id. If no matching id is found, the call is forwarded to the
-    * superclass.
-    * <p>
-    * The property view uses the IDs from the IPropertyDescriptors array to set the values of the corresponding
-    * properties.
-    * </p>
-    * 
-    * @see #descriptors
-    * @see #getPropertyDescriptors()
-    */
-   @Override
-   public void setPropertyValue(Object propertyId, Object value) {
-      if (XPOS_PROP.equals(propertyId)) {
-         int x = Integer.parseInt((String) value);
-         setLocation(new Point(x, location.y));
-      } else if (YPOS_PROP.equals(propertyId)) {
-         int y = Integer.parseInt((String) value);
-         setLocation(new Point(location.x, y));
-      } else if (HEIGHT_PROP.equals(propertyId)) {
-         int height = Integer.parseInt((String) value);
-         setSize(new Dimension(size.width, height));
-      } else if (WIDTH_PROP.equals(propertyId)) {
-         int width = Integer.parseInt((String) value);
-         setSize(new Dimension(width, size.height));
-      } else {
-         super.setPropertyValue(propertyId, value);
-      }
-   }
-
-   /**
-    * Set the Size of this shape. Will not modify the size if newSize is null.
-    * 
-    * @param newSize a non-null Dimension instance or null
-    */
-   public void setSize(Dimension newSize) {
-      if (newSize != null) {
-         size.setSize(newSize);
-         firePropertyChange(SIZE_PROP, null, size);
-      }
-   }
-
-   /**
-    * @return the workflowDiagram
-    */
-   public WorkflowDiagram getWorkflowDiagram() {
-      return workflowDiagram;
-   }
-
-   /**
-    * @param workflowDiagram the workflowDiagram to set
-    */
-   public void setWorkflowDiagram(WorkflowDiagram workflowDiagram) {
-      this.workflowDiagram = workflowDiagram;
-   }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/TransitionConnection.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/TransitionConnection.java
deleted file mode 100644
index 843416e..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/TransitionConnection.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.editor.model;
-
-import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
-import org.eclipse.osee.framework.ui.plugin.util.Result;
-import org.eclipse.osee.framework.ui.swt.Displays;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.eclipse.ui.views.properties.TextPropertyDescriptor;
-
-/**
- * A connection between two distinct shapes.
- * 
- * @author Donald G. Dunne
- */
-public class TransitionConnection extends Relation {
-
-   /** Property ID to use when the line style of this connection is modified. */
-   public static final String TYPE_PROP = "Type";
-   private static final IPropertyDescriptor[] descriptors = new IPropertyDescriptor[1];
-
-   static {
-      descriptors[0] = new TextPropertyDescriptor(TYPE_PROP, TYPE_PROP);
-   }
-
-   public TransitionConnection(Shape source, Shape target) {
-      super(source, target);
-   }
-
-   @Override
-   public Color getForegroundColor() {
-      return Displays.getSystemColor(SWT.COLOR_BLACK);
-   }
-
-   @Override
-   public String toString() {
-      return "Transition: " + getPropertyValue(TYPE_PROP);
-   }
-
-   @Override
-   public Result validForSave() {
-      // TODO Add Relation validations
-      return Result.TrueResult;
-   }
-
-   /**
-    * Returns the descriptor for the lineStyle property
-    * 
-    * @see org.eclipse.ui.views.properties.IPropertySource#getPropertyDescriptors()
-    */
-   @Override
-   public IPropertyDescriptor[] getPropertyDescriptors() {
-      return descriptors;
-   }
-
-   /**
-    * Returns the lineStyle as String for the Property Sheet
-    * 
-    * @see org.eclipse.ui.views.properties.IPropertySource#getPropertyValue(java.lang.Object)
-    */
-   @Override
-   public Object getPropertyValue(Object id) {
-      if (id.equals(TYPE_PROP)) {
-         return getLabel();
-      }
-      return super.getPropertyValue(id);
-   }
-
-   @Override
-   public String getLabel() {
-      return "Transition";
-   }
-
-   @Override
-   public int getLineWidth() {
-      return 2;
-   }
-
-   @Override
-   public Result doSave(SkynetTransaction transaction) {
-      return Result.TrueResult;
-   }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/WorkPageShape.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/WorkPageShape.java
deleted file mode 100644
index 3296f02..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/WorkPageShape.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.editor.model;
-
-import java.util.List;
-import java.util.logging.Level;
-import org.eclipse.osee.ats.internal.AtsPlugin;
-import org.eclipse.osee.ats.util.AtsUtil;
-import org.eclipse.osee.ats.workdef.StateDefinition;
-import org.eclipse.osee.ats.workflow.item.AtsWorkDefinitions;
-import org.eclipse.osee.ats.workflow.page.AtsCancelledWorkPageDefinition;
-import org.eclipse.osee.ats.workflow.page.AtsCompletedWorkPageDefinition;
-import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.util.Strings;
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
-import org.eclipse.osee.framework.ui.plugin.util.Result;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinitionFactory;
-import org.eclipse.ui.views.properties.ComboBoxPropertyDescriptor;
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.eclipse.ui.views.properties.TextPropertyDescriptor;
-
-/**
- * A rectangular shape.
- * 
- * @author Donald G. Dunne
- */
-public class WorkPageShape extends RectangleShape {
-   private static final String[] attributeProperties = new String[] { //
-      CoreAttributeTypes.WorkPageName.getName(), //
-         CoreAttributeTypes.WorkId.getName(), //
-         CoreAttributeTypes.WorkParentId.getName(),//
-      };
-
-   private final StateDefinition workPageDefinition;
-
-   public final static String START_PAGE = "Start Page";
-   private Artifact artifact;
-   public static enum StartPageEnum {
-      Yes,
-      No
-   };
-
-   public WorkPageShape() {
-      //      this(new WorkPageDefinition("New" + AtsUtil.getAtsDeveloperIncrementingNum(), "NEW", null, WorkPageType.Working,
-      //         AtsUtil.getAtsDeveloperIncrementingNum()));
-      this(new StateDefinition("New" + AtsUtil.getAtsDeveloperIncrementingNum()));
-   }
-
-   public WorkPageShape(StateDefinition workPageDefinition) {
-      this.workPageDefinition = workPageDefinition;
-      //      try {
-      //         //         artifact = WorkItemDefinitionFactory.getWorkItemDefinitionArtifact(workPageDefinition.getId());
-      //      } catch (OseeCoreException ex) {
-      //         OseeLog.log(AtsPlugin.class, Level.SEVERE, ex);
-      //      }
-   }
-
-   @Override
-   public void setWorkflowDiagram(WorkflowDiagram workflowDiagram) {
-      super.setWorkflowDiagram(workflowDiagram);
-      if (getId().equals("NEW")) {
-         setPropertyValue(
-            CoreAttributeTypes.WorkId.getName(),
-            workflowDiagram.getWorkFlowDefinition().getName() + "." + getPropertyValue(CoreAttributeTypes.WorkPageName.getName()));
-      }
-   }
-
-   @Override
-   protected void initializePropertyDescriptors(List<IPropertyDescriptor> descriptorList) {
-      super.initializePropertyDescriptors(descriptorList);
-      for (String type : attributeProperties) {
-         descriptorList.add(new TextPropertyDescriptor(type, type)); // id and description pair
-      }
-      descriptorList.add(new ComboBoxPropertyDescriptor(START_PAGE, START_PAGE, new String[] {
-         StartPageEnum.Yes.name(),
-         StartPageEnum.No.name()}));
-   }
-
-   @Override
-   protected void initializePropertyValues() throws OseeCoreException {
-      if (propertyValues == null) {
-         super.initializePropertyValues();
-         super.setPropertyValue(CoreAttributeTypes.WorkPageName.getName(), workPageDefinition.getPageName());
-         super.setPropertyValue(CoreAttributeTypes.WorkId.getName(), workPageDefinition.getName());
-         super.setPropertyValue(CoreAttributeTypes.WorkParentId.getName(),
-            workPageDefinition.getName() == null ? "" : workPageDefinition.getName());
-      }
-   }
-
-   public boolean isStartPage() {
-      if (getPropertyValue(START_PAGE) == null) {
-         return false;
-      }
-      return (Integer) getPropertyValue(START_PAGE) == StartPageEnum.Yes.ordinal();
-   }
-
-   public void setStartPage(boolean set) {
-      setPropertyValue(START_PAGE, set ? StartPageEnum.Yes.ordinal() : StartPageEnum.No.ordinal());
-   }
-
-   @Override
-   public Object getPropertyValue(Object propertyId) {
-      try {
-         initializePropertyValues();
-      } catch (OseeCoreException ex) {
-         OseeLog.log(AtsPlugin.class, Level.SEVERE, ex);
-      }
-      return super.getPropertyValue(propertyId);
-   }
-
-   public Artifact getArtifact() {
-      return artifact;
-   }
-
-   /**
-    * @return the workPageDefinition
-    */
-   public StateDefinition getWorkPageDefinition() {
-      return workPageDefinition;
-   }
-
-   @Override
-   public Result validForSave() {
-      try {
-         String pageName = (String) getPropertyValue(CoreAttributeTypes.WorkPageName.getName());
-         if (!Strings.isValid(pageName)) {
-            return new Result(CoreAttributeTypes.WorkPageName.getName() + " can not be null");
-         }
-         String pageId = (String) getPropertyValue(CoreAttributeTypes.WorkId.getName());
-         if (!Strings.isValid(pageId)) {
-            return new Result(CoreAttributeTypes.WorkId.getName() + " can not be null");
-         }
-         String parentPageId = (String) getPropertyValue(CoreAttributeTypes.WorkParentId.getName());
-         if (Strings.isValid(parentPageId) && WorkItemDefinitionFactory.getWorkItemDefinition(parentPageId) == null) {
-            return new Result("Parent Id " + parentPageId + " Work Page Definition must exist and does not.");
-         }
-      } catch (OseeCoreException ex) {
-         return new Result("Exception in validation " + ex.getLocalizedMessage());
-      }
-      return Result.TrueResult;
-   }
-
-   public boolean isInstanceof(String workPageDefinitionId) throws OseeCoreException {
-      return isInstanceofRecurse(workPageDefinition, workPageDefinitionId);
-   }
-
-   @SuppressWarnings("unused")
-   private boolean isInstanceofRecurse(StateDefinition workPageDefinition, String workPageDefinitionId) throws OseeCoreException {
-      if (workPageDefinition.getName().equals(workPageDefinitionId)) {
-         return true;
-      }
-      //      if (workPageDefinition.getParent() != null) {
-      //         return isInstanceofRecurse((StateDefinition) workPageDefinition.getParent(), workPageDefinitionId);
-      //      }
-      return false;
-   }
-
-   public boolean isCancelledState() throws OseeCoreException {
-      return isInstanceof(AtsCancelledWorkPageDefinition.ID);
-   }
-
-   public boolean isCompletedState() throws OseeCoreException {
-      return isInstanceof(AtsCompletedWorkPageDefinition.ID);
-   }
-
-   @Override
-   public String getName() {
-      return (String) getPropertyValue(CoreAttributeTypes.WorkPageName.getName());
-   }
-
-   @Override
-   public String getToolTip() {
-      return workPageDefinition.toString();
-   }
-
-   @Override
-   public String toString() {
-      return getId();
-   }
-
-   public String getId() {
-      return (String) getPropertyValue(CoreAttributeTypes.WorkId.getName());
-   }
-
-   @Override
-   public boolean equals(Object obj) {
-      if (obj instanceof WorkPageShape) {
-         return ((WorkPageShape) obj).getId().equals(getId());
-      }
-      return super.equals(obj);
-   }
-
-   @Override
-   public int hashCode() {
-      return getId().hashCode();
-   }
-
-   @Override
-   public void setPropertyValue(Object propertyId, Object value) {
-      try {
-         initializePropertyValues();
-         if (CoreAttributeTypes.WorkPageName.getName().equals(propertyId)) {
-            super.setPropertyValue(CoreAttributeTypes.WorkPageName.getName(), value);
-            firePropertyChange(CoreAttributeTypes.WorkPageName.getName(), null, value);
-            setPropertyValue(CoreAttributeTypes.WorkId.getName(),
-               getWorkflowDiagram().getWorkFlowDefinition().getName() + "." + value);
-         } else if (CoreAttributeTypes.WorkId.getName().equals(propertyId)) {
-            super.setPropertyValue(CoreAttributeTypes.WorkId.getName(), value);
-            firePropertyChange(CoreAttributeTypes.WorkId.getName(), null, value);
-         } else if (CoreAttributeTypes.WorkParentId.getName().equals(propertyId)) {
-            super.setPropertyValue(CoreAttributeTypes.WorkParentId.getName(), value);
-            firePropertyChange(CoreAttributeTypes.WorkParentId.getName(), null, value);
-         } else if (START_PAGE.equals(propertyId)) {
-            super.setPropertyValue(START_PAGE, value);
-            firePropertyChange(START_PAGE, null, value);
-         } else {
-            super.setPropertyValue(propertyId, value);
-         }
-      } catch (OseeCoreException ex) {
-         OseeLog.log(AtsPlugin.class, Level.SEVERE, ex);
-      }
-   }
-
-   @Override
-   public Result doSave(SkynetTransaction transaction) throws OseeCoreException {
-      String name = (String) getPropertyValue(CoreAttributeTypes.WorkPageName.getName());
-      String workId = (String) getPropertyValue(CoreAttributeTypes.WorkId.getName());
-      String parentWorkId = (String) getPropertyValue(CoreAttributeTypes.WorkParentId.getName());
-
-      workPageDefinition.setName(name);
-      Artifact artifact = getArtifact();
-      if (artifact == null) {
-         //         artifact = workPageDefinition.toArtifact(WriteType.New);
-      } else {
-         artifact.setSoleAttributeValue(CoreAttributeTypes.WorkPageName, name);
-         artifact.setSoleAttributeValue(CoreAttributeTypes.WorkId, workId);
-         if (!Strings.isValid(parentWorkId)) {
-            artifact.deleteSoleAttribute(CoreAttributeTypes.WorkParentId);
-         } else {
-            artifact.setSoleAttributeValue(CoreAttributeTypes.WorkParentId, parentWorkId);
-         }
-      }
-      artifact.setName(workId);
-      AtsWorkDefinitions.addUpdateWorkItemToDefaultHeirarchy(artifact, transaction);
-      //      WorkItemDefinitionFactory.deCache(workPageDefinition);
-      artifact.persist(transaction);
-      return Result.TrueResult;
-   }
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/WorkflowDiagram.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/WorkflowDiagram.java
deleted file mode 100644
index 2add40e..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/WorkflowDiagram.java
+++ /dev/null
@@ -1,288 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.editor.model;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import org.eclipse.osee.ats.internal.AtsPlugin;
-import org.eclipse.osee.ats.workdef.WorkDefinition;
-import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.logging.OseeLevel;
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
-import org.eclipse.osee.framework.ui.plugin.util.Result;
-
-/**
- * A container for multiple shapes. This is the "root" of the model data structure.
- * 
- * @author Donald G. Dunne
- */
-public class WorkflowDiagram extends ModelElement {
-
-   /** Property ID to use when a child is added to this diagram. */
-   public static final String CHILD_ADDED_PROP = "WorkflowDiagram.ChildAdded";
-   /** Property ID to use when a child is removed from this diagram. */
-   public static final String CHILD_REMOVED_PROP = "WorkflowDiagram.ChildRemoved";
-   private final List<Shape> shapes = new ArrayList<Shape>();
-   private final List<Shape> deletedShapes = new ArrayList<Shape>();
-   private final WorkDefinition workFlowDefinition;
-
-   public WorkflowDiagram(WorkDefinition workFlowDefinition) {
-      super();
-      this.workFlowDefinition = workFlowDefinition;
-   }
-
-   @Override
-   public Result doSave(SkynetTransaction transaction) throws OseeCoreException {
-      Result result = validForSave();
-      if (result.isFalse()) {
-         return result;
-      }
-      try {
-
-         List<WorkPageShape> workPageShapes = new ArrayList<WorkPageShape>();
-         for (Shape shape : getChildren()) {
-            if (shape instanceof WorkPageShape) {
-               workPageShapes.add((WorkPageShape) shape);
-            }
-         }
-
-         // Remove all states that do not exist anymore
-         for (Shape shape : deletedShapes) {
-            if (WorkPageShape.class.isAssignableFrom(shape.getClass())) {
-               WorkPageShape workPageShape = (WorkPageShape) shape;
-               if (workPageShape.getArtifact() != null) {
-                  workPageShape.getArtifact().deleteAndPersist(transaction);
-                  //                  workFlowDefinition.removeWorkItem(((WorkPageShape) shape).getId());
-               }
-            }
-         }
-
-         // Save new states and modifications to states
-         for (WorkPageShape workPageShape : workPageShapes) {
-            result = workPageShape.doSave(transaction);
-            if (result.isFalse()) {
-               return result;
-            }
-         }
-
-         // Set start page
-         for (WorkPageShape workPageShape : workPageShapes) {
-            if (workPageShape.isStartPage()) {
-               //               workFlowDefinition.setStartPageId(workPageShape.getWorkPageDefinition().getPageName());
-               break;
-            }
-         }
-
-         // Validate transitions
-         validateTransitions();
-         //         workFlowDefinition.loadPageData(true);
-
-         //         Artifact artifact = workFlowDefinition.toArtifact(WriteType.Update);
-         //         AtsWorkDefinitions.addUpdateWorkItemToDefaultHeirarchy(artifact, transaction);
-         //         artifact.persist(transaction);
-
-         //         WorkItemDefinitionFactory.deCache(workFlowDefinition);
-
-         // Validate saved workflows and all corresponding workItemDefinitions
-         // prior to completion of save
-         //         result = AtsWorkDefinitions.validateWorkItemDefinition(workFlowDefinition);
-         //         if (result.isFalse()) {
-         //            return result;
-         //         }
-         for (Shape shape : getChildren()) {
-            if (WorkPageShape.class.isAssignableFrom(shape.getClass())) {
-               //               StateDefinition workPageDefinition = ((WorkPageShape) shape).getWorkPageDefinition();
-               //               result = AtsWorkDefinitions.validateWorkItemDefinition(workPageDefinition);
-               if (result.isFalse()) {
-                  return result;
-               }
-            }
-         }
-
-      } catch (OseeCoreException ex) {
-         OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
-      }
-      return Result.TrueResult;
-   }
-
-   private void validateTransitions() {
-      //      workFlowDefinition.clearTransitions();
-      //      for (Relation connection : getConnections()) {
-      //         if (TransitionConnection.class.isAssignableFrom(connection.getClass())) {
-      //            TransitionConnection transConn = (TransitionConnection) connection;
-      //            if (transConn instanceof DefaultTransitionConnection) {
-      //               workFlowDefinition.addPageTransition(
-      //                  ((WorkPageShape) transConn.getSource()).getWorkPageDefinition().getPageName(),
-      //                  ((WorkPageShape) transConn.getTarget()).getWorkPageDefinition().getPageName(),
-      //                  TransitionType.ToPageAsDefault);
-      //            } else if (transConn instanceof ReturnTransitionConnection) {
-      //               workFlowDefinition.addPageTransition(
-      //                  ((WorkPageShape) transConn.getSource()).getWorkPageDefinition().getPageName(),
-      //                  ((WorkPageShape) transConn.getTarget()).getWorkPageDefinition().getPageName(),
-      //                  TransitionType.ToPageAsReturn);
-      //            } else {
-      //               workFlowDefinition.addPageTransition(
-      //                  ((WorkPageShape) transConn.getSource()).getWorkPageDefinition().getPageName(),
-      //                  ((WorkPageShape) transConn.getTarget()).getWorkPageDefinition().getPageName(), TransitionType.ToPage);
-      //            }
-      //         }
-      //      }
-   }
-
-   @Override
-   public Result validForSave() throws OseeCoreException {
-
-      // Validate # Completed states
-      int num = 0;
-      for (Shape shape : getChildren()) {
-         num += shape instanceof CompletedWorkPageShape ? 1 : 0;
-      }
-      if (num > 1 || num == 0) {
-         return new Result("Must have only 1 Completed state; Currently " + num);
-      }
-
-      // Validate # Cancelled states
-      num = 0;
-      for (Shape shape : getChildren()) {
-         num += shape instanceof CancelledWorkPageShape ? 1 : 0;
-      }
-      if (num > 1 || num == 0) {
-         return new Result("Must have only 1 Cancelled state; Currently " + num);
-      }
-
-      // Validate # other states
-      num = 0;
-      for (Shape shape : getChildren()) {
-         num += !(shape instanceof CompletedWorkPageShape) && !(shape instanceof CancelledWorkPageShape) ? 1 : 0;
-      }
-      if (num == 0) {
-         return new Result("Must have > 0 states; Currently " + num);
-      }
-
-      // Validate # other states
-      num = 0;
-      for (Shape shape : getChildren()) {
-         if (WorkPageShape.class.isAssignableFrom(shape.getClass()) && ((WorkPageShape) shape).isStartPage()) {
-            if (((WorkPageShape) shape).isCancelledState()) {
-               return new Result("Cancelled state can not be start page");
-            }
-            if (((WorkPageShape) shape).isCompletedState()) {
-               return new Result("Completed state can not be start page");
-            }
-            num++;
-         }
-      }
-      if (num > 1 || num == 0) {
-         return new Result("Must have 1 start page; Currently " + num);
-      }
-
-      // Validate state names
-      List<String> stateNames = new ArrayList<String>();
-      for (Shape shape : getChildren()) {
-         if (WorkPageShape.class.isAssignableFrom(shape.getClass())) {
-            String name = (String) ((WorkPageShape) shape).getPropertyValue(CoreAttributeTypes.WorkPageName);
-            if (stateNames.contains(name)) {
-               return new Result(
-                  "Workflow can not have more than one state of same name.  Multiples found of name " + name);
-            }
-            stateNames.add(name);
-         }
-      }
-
-      // Validate transitions (each state must have a transition to or from
-      for (Shape shape : getChildren()) {
-         if (WorkPageShape.class.isAssignableFrom(shape.getClass()) && shape.getSourceConnections().isEmpty() && shape.getTargetConnections().isEmpty()) {
-            return new Result("States must have at least one transition to or from.  None found for " + shape);
-         }
-      }
-
-      // Validate children shapes
-      for (Shape shape : getChildren()) {
-         Result result = shape.validForSave();
-         if (result.isFalse()) {
-            return result;
-         }
-      }
-      return Result.TrueResult;
-   }
-
-   @Override
-   public String toString() {
-      return "Work Flow Definition: " + workFlowDefinition.getName();
-   }
-
-   /**
-    * Add a shape to this diagram.
-    * 
-    * @param s a non-null shape instance
-    * @return true, if the shape was added, false otherwise
-    */
-   public boolean addChild(Shape s) {
-      if (s != null && shapes.add(s)) {
-         deletedShapes.remove(s);
-         s.setWorkflowDiagram(this);
-         firePropertyChange(CHILD_ADDED_PROP, null, s);
-         return true;
-      }
-      return false;
-   }
-
-   public boolean hasChild(Shape s) {
-      for (Object obj : shapes) {
-         Shape shape = (Shape) obj;
-         if (shape.equals(s)) {
-            return true;
-         }
-      }
-      return false;
-   }
-
-   /** Return a List of Shapes in this diagram. The returned List should not be modified. */
-   public List<Shape> getChildren() {
-      return shapes;
-   }
-
-   public Set<Relation> getConnections() {
-      Set<Relation> connections = new HashSet<Relation>();
-      for (Shape shape : getChildren()) {
-         connections.addAll(shape.getSourceConnections());
-         connections.addAll(shape.getTargetConnections());
-      }
-      return connections;
-   }
-
-   /**
-    * Remove a shape from this diagram.
-    * 
-    * @param s a non-null shape instance;
-    * @return true, if the shape was removed, false otherwise
-    */
-   public boolean removeChild(Shape s) {
-      if (s != null && shapes.remove(s)) {
-         deletedShapes.add(s);
-         firePropertyChange(CHILD_REMOVED_PROP, null, s);
-         return true;
-      }
-      return false;
-   }
-
-   /**
-    * @return the workFlowDefinition
-    */
-   public WorkDefinition getWorkFlowDefinition() {
-      return workFlowDefinition;
-   }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/commands/ConnectionCreateCommand.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/commands/ConnectionCreateCommand.java
deleted file mode 100644
index 0508f04..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/commands/ConnectionCreateCommand.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.editor.model.commands;
-
-import java.util.Iterator;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.osee.ats.workflow.editor.model.Relation;
-import org.eclipse.osee.ats.workflow.editor.model.DefaultTransitionConnection;
-import org.eclipse.osee.ats.workflow.editor.model.ReturnTransitionConnection;
-import org.eclipse.osee.ats.workflow.editor.model.Shape;
-import org.eclipse.osee.ats.workflow.editor.model.TransitionConnection;
-
-/**
- * A command to create a connection between two shapes. The command can be undone or redone.
- * <p>
- * This command is designed to be used together with a GraphicalNodeEditPolicy. To use this command properly, following
- * steps are necessary:
- * </p>
- * <ol>
- * <li>Create a subclass of GraphicalNodeEditPolicy.</li>
- * <li>Override the <tt>getConnectionCreateCommand(...)</tt> method, to create a new instance of this class and put it
- * into the CreateConnectionRequest.</li>
- * <li>Override the <tt>getConnectionCompleteCommand(...)</tt> method, to obtain the Command from the ConnectionRequest,
- * call setTarget(...) to set the target endpoint of the connection and return this command instance.</li>
- * </ol>
- * 
- * @see org.eclipse.osee.ats.workflow.editor.parts.ShapeEditPart#createEditPolicies() for an example of the above
- * procedure.
- * @see org.eclipse.gef.editpolicies.GraphicalNodeEditPolicy
- * @author Donald G. Dunne
- */
-public class ConnectionCreateCommand extends Command {
-   /** The connection instance. */
-   private Relation connection;
-
-   /** Start endpoint for the connection. */
-   private final Shape source;
-   /** Target endpoint for the connection. */
-   private Shape target;
-   private final Class<?> clazz;
-
-   /**
-    * Instantiate a command that can create a connection between two shapes.
-    * 
-    * @param source the source endpoint (a non-null Shape instance)
-    * @param lineStyle the desired line style. See Relation#setLineStyle(int) for details
-    * @throws IllegalArgumentException if source is null
-    * @see Relation#setLineStyle(int)
-    */
-   @SuppressWarnings("rawtypes")
-   public ConnectionCreateCommand(Shape source, Class clazz) {
-      this.clazz = clazz;
-      if (source == null) {
-         throw new IllegalArgumentException();
-      }
-      setLabel("connection creation");
-      this.source = source;
-   }
-
-   @Override
-   public boolean canExecute() {
-      // disallow source -> source connections
-      if (source.equals(target)) {
-         return false;
-      }
-      // return false, if the source -> target connection exists already
-      for (Iterator<?> iter = source.getSourceConnections().iterator(); iter.hasNext();) {
-         Relation conn = (Relation) iter.next();
-         if (conn.getTarget().equals(target)) {
-            return false;
-         }
-      }
-      return true;
-   }
-
-   @Override
-   public void execute() {
-      // create a new connection between source and target
-      if (clazz == DefaultTransitionConnection.class) {
-         connection = new DefaultTransitionConnection(source, target);
-      } else if (clazz == ReturnTransitionConnection.class) {
-         connection = new ReturnTransitionConnection(source, target);
-      } else if (clazz == TransitionConnection.class) {
-         connection = new TransitionConnection(source, target);
-      } else {
-         throw new IllegalStateException("Unhandled connection type");
-      }
-   }
-
-   @Override
-   public void redo() {
-      connection.reconnect();
-   }
-
-   /**
-    * Set the target endpoint for the connection.
-    * 
-    * @param target that target endpoint (a non-null Shape instance)
-    * @throws IllegalArgumentException if target is null
-    */
-   public void setTarget(Shape target) {
-      if (target == null) {
-         throw new IllegalArgumentException();
-      }
-      this.target = target;
-   }
-
-   @Override
-   public void undo() {
-      connection.disconnect();
-   }
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/commands/ConnectionDeleteCommand.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/commands/ConnectionDeleteCommand.java
deleted file mode 100644
index d28e694..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/commands/ConnectionDeleteCommand.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.editor.model.commands;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.osee.ats.workflow.editor.model.Relation;
-
-/**
- * A command to disconnect (remove) a connection from its endpoints. The command can be undone or redone.
- * 
- * @author Donald G. Dunne
- */
-public class ConnectionDeleteCommand extends Command {
-
-   /** Relation instance to disconnect. */
-   private final Relation connection;
-
-   /**
-    * Create a command that will disconnect a connection from its endpoints.
-    * 
-    * @param conn the connection instance to disconnect (non-null)
-    * @throws IllegalArgumentException if conn is null
-    */
-   public ConnectionDeleteCommand(Relation conn) {
-      if (conn == null) {
-         throw new IllegalArgumentException();
-      }
-      setLabel("connection deletion");
-      this.connection = conn;
-   }
-
-   @Override
-   public void execute() {
-      connection.disconnect();
-   }
-
-   @Override
-   public void undo() {
-      connection.reconnect();
-   }
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/commands/ConnectionReconnectCommand.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/commands/ConnectionReconnectCommand.java
deleted file mode 100644
index 9456745..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/commands/ConnectionReconnectCommand.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.editor.model.commands;
-
-import java.util.Iterator;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.osee.ats.workflow.editor.model.Relation;
-import org.eclipse.osee.ats.workflow.editor.model.Shape;
-
-/**
- * A command to reconnect a connection to a different start point or end point. The command can be undone or redone.
- * <p>
- * This command is designed to be used together with a GraphicalNodeEditPolicy. To use this command propertly, following
- * steps are necessary:
- * </p>
- * <ol>
- * <li>Create a subclass of GraphicalNodeEditPolicy.</li>
- * <li>Override the <tt>getReconnectSourceCommand(...)</tt> method. Here you need to obtain the Relation model element
- * from the ReconnectRequest, create a new ConnectionReconnectCommand, set the new connection <i>source</i> by calling
- * the <tt>setNewSource(Shape)</tt> method and return the command instance.
- * <li>Override the <tt>getReconnectTargetCommand(...)</tt> method.</li> Here again you need to obtain the Relation
- * model element from the ReconnectRequest, create a new ConnectionReconnectCommand, set the new connection
- * <i>target</i> by calling the <tt>setNewTarget(Shape)</tt> method and return the command instance.</li>
- * </ol>
- * 
- * @see org.eclipse.osee.ats.workflow.editor.parts.ShapeEditPart#createEditPolicies() for an example of the above
- * procedure.
- * @see org.eclipse.gef.editpolicies.GraphicalNodeEditPolicy
- * @see #setNewSource(Shape)
- * @see #setNewTarget(Shape)
- * @author Donald G. Dunne
- */
-public class ConnectionReconnectCommand extends Command {
-
-   /** The connection instance to reconnect. */
-   private final Relation connection;
-   /** The new source endpoint. */
-   private Shape newSource;
-   /** The new target endpoint. */
-   private Shape newTarget;
-   /** The original source endpoint. */
-   private final Shape oldSource;
-   /** The original target endpoint. */
-   private final Shape oldTarget;
-
-   /**
-    * Instantiate a command that can reconnect a Relation instance to a different source or target endpoint.
-    * 
-    * @param conn the connection instance to reconnect (non-null)
-    * @throws IllegalArgumentException if conn is null
-    */
-   public ConnectionReconnectCommand(Relation conn) {
-      if (conn == null) {
-         throw new IllegalArgumentException();
-      }
-      this.connection = conn;
-      this.oldSource = conn.getSource();
-      this.oldTarget = conn.getTarget();
-   }
-
-   @Override
-   public boolean canExecute() {
-      if (newSource != null) {
-         return checkSourceReconnection();
-      } else if (newTarget != null) {
-         return checkTargetReconnection();
-      }
-      return false;
-   }
-
-   /**
-    * Return true, if reconnecting the connection-instance to newSource is allowed.
-    */
-   private boolean checkSourceReconnection() {
-      // connection endpoints must be different Shapes
-      if (newSource.equals(oldTarget)) {
-         return false;
-      }
-      // return false, if the connection exists already
-      for (Iterator<?> iter = newSource.getSourceConnections().iterator(); iter.hasNext();) {
-         Relation conn = (Relation) iter.next();
-         // return false if a newSource -> oldTarget connection exists already
-         // and it is a different instance than the connection-field
-         if (conn.getTarget().equals(oldTarget) && !conn.equals(connection)) {
-            return false;
-         }
-      }
-      return true;
-   }
-
-   /**
-    * Return true, if reconnecting the connection-instance to newTarget is allowed.
-    */
-   private boolean checkTargetReconnection() {
-      // connection endpoints must be different Shapes
-      if (newTarget.equals(oldSource)) {
-         return false;
-      }
-      // return false, if the connection exists already
-      for (Iterator<?> iter = newTarget.getTargetConnections().iterator(); iter.hasNext();) {
-         Relation conn = (Relation) iter.next();
-         // return false if a oldSource -> newTarget connection exists already
-         // and it is a differenct instance that the connection-field
-         if (conn.getSource().equals(oldSource) && !conn.equals(connection)) {
-            return false;
-         }
-      }
-      return true;
-   }
-
-   /**
-    * Reconnect the connection to newSource (if setNewSource(...) was invoked before) or newTarget (if setNewTarget(...)
-    * was invoked before).
-    */
-   @Override
-   public void execute() {
-      if (newSource != null) {
-         connection.reconnect(newSource, oldTarget);
-      } else if (newTarget != null) {
-         connection.reconnect(oldSource, newTarget);
-      } else {
-         throw new IllegalStateException("Should not happen");
-      }
-   }
-
-   /**
-    * Set a new source endpoint for this connection. When execute() is invoked, the source endpoint of the connection
-    * will be attached to the supplied Shape instance.
-    * <p>
-    * Note: Calling this method, deactivates reconnection of the <i>target</i> endpoint. A single instance of this
-    * command can only reconnect either the source or the target endpoint.
-    * </p>
-    * 
-    * @param connectionSource a non-null Shape instance, to be used as a new source endpoint
-    * @throws IllegalArgumentException if connectionSource is null
-    */
-   public void setNewSource(Shape connectionSource) {
-      if (connectionSource == null) {
-         throw new IllegalArgumentException();
-      }
-      setLabel("move connection startpoint");
-      newSource = connectionSource;
-      newTarget = null;
-   }
-
-   /**
-    * Set a new target endpoint for this connection When execute() is invoked, the target endpoint of the connection
-    * will be attached to the supplied Shape instance.
-    * <p>
-    * Note: Calling this method, deactivates reconnection of the <i>source</i> endpoint. A single instance of this
-    * command can only reconnect either the source or the target endpoint.
-    * </p>
-    * 
-    * @param connectionTarget a non-null Shape instance, to be used as a new target endpoint
-    * @throws IllegalArgumentException if connectionTarget is null
-    */
-   public void setNewTarget(Shape connectionTarget) {
-      if (connectionTarget == null) {
-         throw new IllegalArgumentException();
-      }
-      setLabel("move connection endpoint");
-      newSource = null;
-      newTarget = connectionTarget;
-   }
-
-   /**
-    * Reconnect the connection to its original source and target endpoints.
-    */
-   @Override
-   public void undo() {
-      connection.reconnect(oldSource, oldTarget);
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/commands/ShapeCreateCommand.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/commands/ShapeCreateCommand.java
deleted file mode 100644
index bcd1d8f..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/commands/ShapeCreateCommand.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.editor.model.commands;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.osee.ats.workflow.editor.model.Shape;
-import org.eclipse.osee.ats.workflow.editor.model.WorkflowDiagram;
-
-/**
- * A command to add a Shape to a ShapeDiagram. The command can be undone or redone.
- * 
- * @author Donald G. Dunne
- */
-public class ShapeCreateCommand extends Command {
-
-   /** The new shape. */
-   private final Shape newShape;
-   /** ShapeDiagram to add to. */
-   private final WorkflowDiagram parent;
-   /** The bounds of the new Shape. */
-   private final Rectangle bounds;
-
-   /**
-    * Create a command that will add a new Shape to a WorkflowDiagram.
-    * 
-    * @param newShape the new Shape that is to be added
-    * @param parent the WorkflowDiagram that will hold the new element
-    * @param bounds the bounds of the new shape; the size can be (-1, -1) if not known
-    * @throws IllegalArgumentException if any parameter is null, or the request does not provide a new Shape instance
-    */
-   public ShapeCreateCommand(Shape newShape, WorkflowDiagram parent, Rectangle bounds) {
-      this.newShape = newShape;
-      this.newShape.setWorkflowDiagram(parent);
-      this.parent = parent;
-      this.bounds = bounds;
-      setLabel("shape creation");
-   }
-
-   /**
-    * Can execute if all the necessary information has been provided.
-    * 
-    * @see org.eclipse.gef.commands.Command#canExecute()
-    */
-   @Override
-   public boolean canExecute() {
-      boolean create = newShape != null && parent != null && bounds != null;
-      if (!create) {
-         return false;
-      }
-      if (parent.hasChild(newShape)) {
-         return false;
-      }
-      return true;
-   }
-
-   @Override
-   public void execute() {
-      newShape.setLocation(bounds.getLocation());
-      Dimension size = bounds.getSize();
-      if (size.width > 0 && size.height > 0) {
-         newShape.setSize(size);
-      }
-      redo();
-   }
-
-   @Override
-   public void redo() {
-      parent.addChild(newShape);
-   }
-
-   @Override
-   public void undo() {
-      parent.removeChild(newShape);
-   }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/commands/ShapeDeleteCommand.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/commands/ShapeDeleteCommand.java
deleted file mode 100644
index b0c82d5..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/commands/ShapeDeleteCommand.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.editor.model.commands;
-
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.osee.ats.workflow.editor.model.Relation;
-import org.eclipse.osee.ats.workflow.editor.model.Shape;
-import org.eclipse.osee.ats.workflow.editor.model.WorkflowDiagram;
-
-/**
- * A command to remove a shape from its parent. The command can be undone or redone.
- * 
- * @author Donald G. Dunne
- */
-public class ShapeDeleteCommand extends Command {
-   /** Shape to remove. */
-   private final Shape child;
-
-   /** ShapeDiagram to remove from. */
-   private final WorkflowDiagram parent;
-   /** Holds a copy of the outgoing connections of child. */
-   private List<Relation> sourceConnections;
-   /** Holds a copy of the incoming connections of child. */
-   private List<Relation> targetConnections;
-   /** True, if child was removed from its parent. */
-   private boolean wasRemoved;
-
-   /**
-    * Create a command that will remove the shape from its parent.
-    * 
-    * @param parent the WorkflowDiagram containing the child
-    * @param child the Shape to remove
-    * @throws IllegalArgumentException if any parameter is null
-    */
-   public ShapeDeleteCommand(WorkflowDiagram parent, Shape child) {
-      if (parent == null || child == null) {
-         throw new IllegalArgumentException();
-      }
-      setLabel("shape deletion");
-      this.parent = parent;
-      this.child = child;
-   }
-
-   /**
-    * Reconnects a List of Connections with their previous endpoints.
-    * 
-    * @param connections a non-null List of connections
-    */
-   private void addConnections(List<Relation> connections) {
-      for (Iterator<Relation> iter = connections.iterator(); iter.hasNext();) {
-         Relation conn = iter.next();
-         conn.reconnect();
-      }
-   }
-
-   @Override
-   public boolean canUndo() {
-      return wasRemoved;
-   }
-
-   @Override
-   public void execute() {
-      // store a copy of incoming & outgoing connections before proceeding
-      sourceConnections = child.getSourceConnections();
-      targetConnections = child.getTargetConnections();
-      redo();
-   }
-
-   @Override
-   public void redo() {
-      // remove the child and disconnect its connections
-      wasRemoved = parent.removeChild(child);
-      if (wasRemoved) {
-         removeConnections(sourceConnections);
-         removeConnections(targetConnections);
-      }
-   }
-
-   /**
-    * Disconnects a List of Connections from their endpoints.
-    * 
-    * @param connections a non-null List of connections
-    */
-   private void removeConnections(List<Relation> connections) {
-      for (Iterator<Relation> iter = connections.iterator(); iter.hasNext();) {
-         Relation conn = iter.next();
-         conn.disconnect();
-      }
-   }
-
-   @Override
-   public void undo() {
-      // add the child and reconnect its connections
-      if (parent.addChild(child)) {
-         addConnections(sourceConnections);
-         addConnections(targetConnections);
-      }
-   }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/commands/ShapeSetConstraintCommand.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/commands/ShapeSetConstraintCommand.java
deleted file mode 100644
index a157715..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/commands/ShapeSetConstraintCommand.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.editor.model.commands;
-
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.RequestConstants;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.requests.ChangeBoundsRequest;
-import org.eclipse.osee.ats.workflow.editor.model.Shape;
-
-/**
- * A command to resize and/or move a shape. The command can be undone or redone.
- * 
- * @author Donald G. Dunne
- */
-public class ShapeSetConstraintCommand extends Command {
-   /** Stores the new size and location. */
-   private final Rectangle newBounds;
-   /** Stores the old size and location. */
-   private Rectangle oldBounds;
-   /** A request to move/resize an edit part. */
-   private final ChangeBoundsRequest request;
-
-   /** Shape to manipulate. */
-   private final Shape shape;
-
-   /**
-    * Create a command that can resize and/or move a shape.
-    * 
-    * @param shape the shape to manipulate
-    * @param req the move and resize request
-    * @param newBounds the new size and location
-    * @throws IllegalArgumentException if any of the parameters is null
-    */
-   public ShapeSetConstraintCommand(Shape shape, ChangeBoundsRequest req, Rectangle newBounds) {
-      if (shape == null || req == null || newBounds == null) {
-         throw new IllegalArgumentException();
-      }
-      this.shape = shape;
-      this.request = req;
-      this.newBounds = newBounds.getCopy();
-      setLabel("move / resize");
-   }
-
-   @Override
-   public boolean canExecute() {
-      Object type = request.getType();
-      // make sure the Request is of a type we support:
-      return RequestConstants.REQ_MOVE.equals(type) || RequestConstants.REQ_MOVE_CHILDREN.equals(type) || RequestConstants.REQ_RESIZE.equals(type) || RequestConstants.REQ_RESIZE_CHILDREN.equals(type);
-   }
-
-   @Override
-   public void execute() {
-      oldBounds = new Rectangle(shape.getLocation(), shape.getSize());
-      redo();
-   }
-
-   @Override
-   public void redo() {
-      shape.setSize(newBounds.getSize());
-      shape.setLocation(newBounds.getLocation());
-   }
-
-   @Override
-   public void undo() {
-      shape.setSize(oldBounds.getSize());
-      shape.setLocation(oldBounds.getLocation());
-   }
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/parts/ConnectionEditPart.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/parts/ConnectionEditPart.java
deleted file mode 100644
index b9fb868..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/parts/ConnectionEditPart.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.editor.parts;
-
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.PolygonDecoration;
-import org.eclipse.draw2d.PolylineConnection;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editparts.AbstractConnectionEditPart;
-import org.eclipse.gef.editpolicies.ConnectionEditPolicy;
-import org.eclipse.gef.editpolicies.ConnectionEndpointEditPolicy;
-import org.eclipse.gef.requests.GroupRequest;
-import org.eclipse.osee.ats.workflow.editor.model.Relation;
-import org.eclipse.osee.ats.workflow.editor.model.ModelElement;
-import org.eclipse.osee.ats.workflow.editor.model.TransitionConnection;
-import org.eclipse.osee.ats.workflow.editor.model.commands.ConnectionDeleteCommand;
-
-/**
- * Edit part for Relation model elements.
- * <p>
- * This edit part must implement the PropertyChangeListener interface, so it can be notified of property changes in the
- * corresponding model element.
- * </p>
- * 
- * @author Donald G. Dunne
- */
-class ConnectionEditPart extends AbstractConnectionEditPart implements PropertyChangeListener {
-
-   /**
-    * Upon activation, attach to the model element as a property change listener.
-    */
-   @Override
-   public void activate() {
-      if (!isActive()) {
-         super.activate();
-         ((ModelElement) getModel()).addPropertyChangeListener(this);
-      }
-   }
-
-   @Override
-   protected void createEditPolicies() {
-      // Selection handle edit policy.
-      // Makes the connection show a feedback, when selected by the user.
-      installEditPolicy(EditPolicy.CONNECTION_ENDPOINTS_ROLE, new ConnectionEndpointEditPolicy());
-      // Allows the removal of the connection model element
-      installEditPolicy(EditPolicy.CONNECTION_ROLE, new ConnectionEditPolicy() {
-         @Override
-         protected Command getDeleteCommand(GroupRequest request) {
-            return new ConnectionDeleteCommand(getCastedModel());
-         }
-      });
-   }
-
-   @Override
-   protected IFigure createFigure() {
-      PolylineConnection connection = (PolylineConnection) super.createFigure();
-      connection.setTargetDecoration(new PolygonDecoration()); // arrow at target endpoint
-      connection.setLineStyle(getCastedModel().getLineStyle()); // line drawing style
-      connection.setForegroundColor(getCastedModel().getForegroundColor());
-      connection.setLineWidth(getCastedModel().getLineWidth());
-      if (getCastedModel().getLabel() != null) {
-         connection.setToolTip(new Label(getCastedModel().getLabel()));
-      }
-      return connection;
-   }
-
-   /**
-    * Upon deactivation, detach from the model element as a property change listener.
-    */
-   @Override
-   public void deactivate() {
-      if (isActive()) {
-         super.deactivate();
-         ((ModelElement) getModel()).removePropertyChangeListener(this);
-      }
-   }
-
-   private Relation getCastedModel() {
-      return (Relation) getModel();
-   }
-
-   @Override
-   public void propertyChange(PropertyChangeEvent event) {
-      String property = event.getPropertyName();
-      if (TransitionConnection.TYPE_PROP.equals(property)) {
-         ((PolylineConnection) getFigure()).setLineStyle(getCastedModel().getLineStyle());
-      }
-   }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/parts/DiagramEditPart.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/parts/DiagramEditPart.java
deleted file mode 100644
index 7c13cc6..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/parts/DiagramEditPart.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.editor.parts;
-
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.util.List;
-import org.eclipse.draw2d.ConnectionLayer;
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.FreeformLayer;
-import org.eclipse.draw2d.FreeformLayout;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.draw2d.ShortestPathConnectionRouter;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.LayerConstants;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.gef.editpolicies.RootComponentEditPolicy;
-import org.eclipse.gef.editpolicies.XYLayoutEditPolicy;
-import org.eclipse.gef.requests.ChangeBoundsRequest;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.osee.ats.workflow.editor.model.EllipticalShape;
-import org.eclipse.osee.ats.workflow.editor.model.ModelElement;
-import org.eclipse.osee.ats.workflow.editor.model.Shape;
-import org.eclipse.osee.ats.workflow.editor.model.WorkPageShape;
-import org.eclipse.osee.ats.workflow.editor.model.WorkflowDiagram;
-import org.eclipse.osee.ats.workflow.editor.model.commands.ShapeCreateCommand;
-import org.eclipse.osee.ats.workflow.editor.model.commands.ShapeSetConstraintCommand;
-
-/**
- * EditPart for the a WorkflowDiagram instance.
- * <p>
- * This edit part server as the main diagram container, the white area where everything else is in. Also responsible for
- * the container's layout (the way the container rearanges is contents) and the container's capabilities (edit
- * policies).
- * </p>
- * <p>
- * This edit part must implement the PropertyChangeListener interface, so it can be notified of property changes in the
- * corresponding model element.
- * </p>
- * 
- * @author Donald G. Dunne
- */
-public class DiagramEditPart extends AbstractGraphicalEditPart implements PropertyChangeListener {
-
-   /**
-    * Upon activation, attach to the model element as a property change listener.
-    */
-   @Override
-   public void activate() {
-      if (!isActive()) {
-         super.activate();
-         ((ModelElement) getModel()).addPropertyChangeListener(this);
-      }
-   }
-
-   @Override
-   protected void createEditPolicies() {
-      // disallows the removal of this edit part from its parent
-      installEditPolicy(EditPolicy.COMPONENT_ROLE, new RootComponentEditPolicy());
-      // handles constraint changes (e.g. moving and/or resizing) of model elements
-      // and creation of new model elements
-      installEditPolicy(EditPolicy.LAYOUT_ROLE, new ShapesXYLayoutEditPolicy());
-   }
-
-   @Override
-   protected IFigure createFigure() {
-      Figure f = new FreeformLayer();
-      f.setBorder(new MarginBorder(3));
-      f.setLayoutManager(new FreeformLayout());
-
-      // Create the static router for the connection layer
-      ConnectionLayer connLayer = (ConnectionLayer) getLayer(LayerConstants.CONNECTION_LAYER);
-      connLayer.setConnectionRouter(new ShortestPathConnectionRouter(f));
-
-      return f;
-   }
-
-   /**
-    * Upon deactivation, detach from the model element as a property change listener.
-    */
-   @Override
-   public void deactivate() {
-      if (isActive()) {
-         super.deactivate();
-         ((ModelElement) getModel()).removePropertyChangeListener(this);
-      }
-   }
-
-   private WorkflowDiagram getCastedModel() {
-      return (WorkflowDiagram) getModel();
-   }
-
-   @Override
-   protected List<?> getModelChildren() {
-      return getCastedModel().getChildren(); // return a list of shapes
-   }
-
-   @Override
-   public void propertyChange(PropertyChangeEvent evt) {
-      String prop = evt.getPropertyName();
-      // these properties are fired when Shapes are added into or removed from
-      // the ShapeDiagram instance and must cause a call of refreshChildren()
-      // to update the diagram's contents.
-      if (WorkflowDiagram.CHILD_ADDED_PROP.equals(prop) || WorkflowDiagram.CHILD_REMOVED_PROP.equals(prop)) {
-         refreshChildren();
-      }
-   }
-
-   /**
-    * EditPolicy for the Figure used by this edit part. Children of XYLayoutEditPolicy can be used in Figures with
-    * XYLayout.
-    * 
-    * @author Donald G. Dunne
-    */
-   private static class ShapesXYLayoutEditPolicy extends XYLayoutEditPolicy {
-
-      @Override
-      protected Command createChangeConstraintCommand(ChangeBoundsRequest request, EditPart child, Object constraint) {
-         if (child instanceof ShapeEditPart && constraint instanceof Rectangle) {
-            // return a command that can move and/or resize a Shape
-            return new ShapeSetConstraintCommand((Shape) child.getModel(), request, (Rectangle) constraint);
-         }
-         return super.createChangeConstraintCommand(request, child, constraint);
-      }
-
-      @Override
-      protected Command createChangeConstraintCommand(EditPart child, Object constraint) {
-         // not used in this example
-         return null;
-      }
-
-      @Override
-      protected Command getCreateCommand(CreateRequest request) {
-         Object childClass = request.getNewObjectType();
-         if (childClass == EllipticalShape.class || WorkPageShape.class.isAssignableFrom(((Class<?>) childClass))) {
-            // return a command that can add a Shape to a WorkflowDiagram
-            return new ShapeCreateCommand((Shape) request.getNewObject(), (WorkflowDiagram) getHost().getModel(),
-               (Rectangle) getConstraintFor(request));
-         }
-         return null;
-      }
-   }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/parts/DiagramTreeEditPart.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/parts/DiagramTreeEditPart.java
deleted file mode 100644
index fadb678..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/parts/DiagramTreeEditPart.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.editor.parts;
-
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.util.List;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.RootEditPart;
-import org.eclipse.gef.editparts.AbstractTreeEditPart;
-import org.eclipse.gef.editpolicies.RootComponentEditPolicy;
-import org.eclipse.osee.ats.workflow.editor.model.ModelElement;
-import org.eclipse.osee.ats.workflow.editor.model.WorkflowDiagram;
-
-/**
- * TreeEditPart for a WorkflowDiagram instance. This is used in the Outline View of the ShapesEditor.
- * <p>
- * This edit part must implement the PropertyChangeListener interface, so it can be notified of property changes in the
- * corresponding model element.
- * </p>
- * 
- * @author Donald G. Dunne
- */
-class DiagramTreeEditPart extends AbstractTreeEditPart implements PropertyChangeListener {
-
-   /**
-    * Create a new instance of this edit part using the given model element.
-    * 
-    * @param model a non-null WorkflowDiagram instance
-    */
-   DiagramTreeEditPart(WorkflowDiagram model) {
-      super(model);
-   }
-
-   /**
-    * Upon activation, attach to the model element as a property change listener.
-    */
-   @Override
-   public void activate() {
-      if (!isActive()) {
-         super.activate();
-         ((ModelElement) getModel()).addPropertyChangeListener(this);
-      }
-   }
-
-   @Override
-   protected void createEditPolicies() {
-      // If this editpart is the root content of the viewer, then disallow removal
-      if (getParent() instanceof RootEditPart) {
-         installEditPolicy(EditPolicy.COMPONENT_ROLE, new RootComponentEditPolicy());
-      }
-   }
-
-   /**
-    * Upon deactivation, detach from the model element as a property change listener.
-    */
-   @Override
-   public void deactivate() {
-      if (isActive()) {
-         super.deactivate();
-         ((ModelElement) getModel()).removePropertyChangeListener(this);
-      }
-   }
-
-   private WorkflowDiagram getCastedModel() {
-      return (WorkflowDiagram) getModel();
-   }
-
-   /**
-    * Convenience method that returns the EditPart corresponding to a given child.
-    * 
-    * @param child a model element instance
-    * @return the corresponding EditPart or null
-    */
-   private EditPart getEditPartForChild(Object child) {
-      return (EditPart) getViewer().getEditPartRegistry().get(child);
-   }
-
-   @Override
-   protected List<?> getModelChildren() {
-      return getCastedModel().getChildren(); // a list of shapes
-   }
-
-   @Override
-   public void propertyChange(PropertyChangeEvent evt) {
-      String prop = evt.getPropertyName();
-      if (WorkflowDiagram.CHILD_ADDED_PROP.equals(prop)) {
-         // add a child to this edit part
-         // causes an additional entry to appear in the tree of the outline view
-         addChild(createChild(evt.getNewValue()), -1);
-      } else if (WorkflowDiagram.CHILD_REMOVED_PROP.equals(prop)) {
-         // remove a child from this edit part
-         // causes the corresponding edit part to disappear from the tree in the outline view
-         removeChild(getEditPartForChild(evt.getNewValue()));
-      } else {
-         refreshVisuals();
-      }
-   }
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/parts/LeftAnchor.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/parts/LeftAnchor.java
deleted file mode 100644
index 3c11f50..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/parts/LeftAnchor.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.editor.parts;
-
-import org.eclipse.draw2d.ChopboxAnchor;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-/**
- * @author Donald G. Dunne
- */
-class LeftAnchor extends ChopboxAnchor {
-
-   LeftAnchor(IFigure source) {
-      super(source);
-   }
-
-   @Override
-   public Point getLocation(Point reference) {
-      Rectangle r = getOwner().getBounds().getCopy();
-      getOwner().translateToAbsolute(r);
-      return r.getLeft();
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/parts/RightAnchor.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/parts/RightAnchor.java
deleted file mode 100644
index d9ad559..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/parts/RightAnchor.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.editor.parts;
-
-import org.eclipse.draw2d.ChopboxAnchor;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-/**
- * @author Donald G. Dunne
- */
-class RightAnchor extends ChopboxAnchor {
-
-   RightAnchor(IFigure source) {
-      super(source);
-   }
-
-   @Override
-   public Point getLocation(Point reference) {
-      Rectangle r = getOwner().getBounds().getCopy();
-      getOwner().translateToAbsolute(r);
-      return r.getRight();
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/parts/ShapeComponentEditPolicy.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/parts/ShapeComponentEditPolicy.java
deleted file mode 100644
index 57e904f..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/parts/ShapeComponentEditPolicy.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.editor.parts;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.ComponentEditPolicy;
-import org.eclipse.gef.requests.GroupRequest;
-import org.eclipse.osee.ats.workflow.editor.model.Shape;
-import org.eclipse.osee.ats.workflow.editor.model.WorkflowDiagram;
-import org.eclipse.osee.ats.workflow.editor.model.commands.ShapeDeleteCommand;
-
-/**
- * This edit policy enables the removal of a Shapes instance from its container.
- * 
- * @see ShapeEditPart#createEditPolicies()
- * @see ShapeTreeEditPart#createEditPolicies()
- * @author Donald G. Dunne
- */
-class ShapeComponentEditPolicy extends ComponentEditPolicy {
-
-   @Override
-   protected Command createDeleteCommand(GroupRequest deleteRequest) {
-      Object parent = getHost().getParent().getModel();
-      Object child = getHost().getModel();
-      if (parent instanceof WorkflowDiagram && child instanceof Shape) {
-         return new ShapeDeleteCommand((WorkflowDiagram) parent, (Shape) child);
-      }
-      return super.createDeleteCommand(deleteRequest);
-   }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/parts/ShapeEditPart.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/parts/ShapeEditPart.java
deleted file mode 100644
index 33d5afe..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/parts/ShapeEditPart.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.editor.parts;
-
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.util.List;
-import java.util.logging.Level;
-import org.eclipse.draw2d.ChopboxAnchor;
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.Ellipse;
-import org.eclipse.draw2d.EllipseAnchor;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.RoundedRectangle;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.ConnectionEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.NodeEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.gef.editpolicies.GraphicalNodeEditPolicy;
-import org.eclipse.gef.requests.CreateConnectionRequest;
-import org.eclipse.gef.requests.ReconnectRequest;
-import org.eclipse.osee.ats.internal.AtsPlugin;
-import org.eclipse.osee.ats.workflow.editor.model.Relation;
-import org.eclipse.osee.ats.workflow.editor.model.EllipticalShape;
-import org.eclipse.osee.ats.workflow.editor.model.ModelElement;
-import org.eclipse.osee.ats.workflow.editor.model.RectangleShape;
-import org.eclipse.osee.ats.workflow.editor.model.Shape;
-import org.eclipse.osee.ats.workflow.editor.model.commands.ConnectionCreateCommand;
-import org.eclipse.osee.ats.workflow.editor.model.commands.ConnectionReconnectCommand;
-import org.eclipse.osee.framework.core.exception.OseeArgumentException;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.logging.OseeLog;
-
-/**
- * EditPart used for Shape instances (more specific for EllipticalShape and RectangularShape instances).
- * <p>
- * This edit part must implement the PropertyChangeListener interface, so it can be notified of property changes in the
- * corresponding model element.
- * </p>
- * 
- * @author Donald G. Dunne
- */
-class ShapeEditPart extends AbstractGraphicalEditPart implements PropertyChangeListener, NodeEditPart {
-
-   private ConnectionAnchor anchor;
-
-   /**
-    * Upon activation, attach to the model element as a property change listener.
-    */
-   @Override
-   public void activate() {
-      if (!isActive()) {
-         super.activate();
-         ((ModelElement) getModel()).addPropertyChangeListener(this);
-      }
-   }
-
-   @Override
-   protected void createEditPolicies() {
-      // allow removal of the associated model element
-      installEditPolicy(EditPolicy.COMPONENT_ROLE, new ShapeComponentEditPolicy());
-      // allow the creation of connections and
-      // and the reconnection of connections between Shape instances
-      installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new GraphicalNodeEditPolicy() {
-         @Override
-         protected Command getConnectionCompleteCommand(CreateConnectionRequest request) {
-            ConnectionCreateCommand cmd = (ConnectionCreateCommand) request.getStartCommand();
-            cmd.setTarget((Shape) getHost().getModel());
-            return cmd;
-         }
-
-         @Override
-         protected Command getConnectionCreateCommand(CreateConnectionRequest request) {
-            Shape source = (Shape) getHost().getModel();
-            Class<?> clazz = (Class<?>) request.getNewObjectType();
-            ConnectionCreateCommand cmd = new ConnectionCreateCommand(source, clazz);
-            request.setStartCommand(cmd);
-            return cmd;
-         }
-
-         @Override
-         protected Command getReconnectSourceCommand(ReconnectRequest request) {
-            Relation conn = (Relation) request.getConnectionEditPart().getModel();
-            Shape newSource = (Shape) getHost().getModel();
-            ConnectionReconnectCommand cmd = new ConnectionReconnectCommand(conn);
-            cmd.setNewSource(newSource);
-            return cmd;
-         }
-
-         @Override
-         protected Command getReconnectTargetCommand(ReconnectRequest request) {
-            Relation conn = (Relation) request.getConnectionEditPart().getModel();
-            Shape newTarget = (Shape) getHost().getModel();
-            ConnectionReconnectCommand cmd = new ConnectionReconnectCommand(conn);
-            cmd.setNewTarget(newTarget);
-            return cmd;
-         }
-      });
-   }
-
-   @Override
-   protected IFigure createFigure() {
-      IFigure f;
-      try {
-         f = createFigureForModel();
-         f.setOpaque(true); // non-transparent figure
-         f.setBackgroundColor(ColorConstants.green);
-         return f;
-      } catch (OseeCoreException ex) {
-         OseeLog.log(AtsPlugin.class, Level.SEVERE, ex);
-      }
-      return null;
-   }
-
-   /**
-    * Return a IFigure depending on the instance of the current model element. This allows this EditPart to be used for
-    * both subclasses of Shape.
-    */
-   protected IFigure createFigureForModel() throws OseeCoreException {
-      if (getModel() instanceof EllipticalShape) {
-         return new Ellipse();
-      }
-      if (getModel() instanceof RectangleShape) {
-         return new RoundedRectangle();
-      }
-      // if Shapes gets extended the conditions above must be updated
-      throw new OseeArgumentException("Unsupported Shape");
-   }
-
-   /**
-    * Upon deactivation, detach from the model element as a property change listener.
-    */
-   @Override
-   public void deactivate() {
-      if (isActive()) {
-         super.deactivate();
-         ((ModelElement) getModel()).removePropertyChangeListener(this);
-      }
-   }
-
-   private Shape getCastedModel() {
-      return (Shape) getModel();
-   }
-
-   protected ConnectionAnchor getConnectionAnchor() throws OseeCoreException {
-      if (anchor == null) {
-         if (getModel() instanceof EllipticalShape) {
-            anchor = new EllipseAnchor(getFigure());
-         } else if (getModel() instanceof RectangleShape) {
-            anchor = new ChopboxAnchor(getFigure());
-         } else {
-            // if Shapes gets extended the conditions above must be updated
-            throw new OseeArgumentException("unexpected model");
-         }
-      }
-      return anchor;
-   }
-
-   @Override
-   protected List<?> getModelSourceConnections() {
-      return getCastedModel().getSourceConnections();
-   }
-
-   @Override
-   protected List<?> getModelTargetConnections() {
-      return getCastedModel().getTargetConnections();
-   }
-
-   @Override
-   public ConnectionAnchor getSourceConnectionAnchor(ConnectionEditPart connection) {
-      try {
-         return getConnectionAnchor();
-      } catch (OseeCoreException ex) {
-         OseeLog.log(AtsPlugin.class, Level.SEVERE, ex);
-      }
-      return null;
-   }
-
-   @Override
-   public ConnectionAnchor getSourceConnectionAnchor(Request request) {
-      try {
-         return getConnectionAnchor();
-      } catch (OseeCoreException ex) {
-         OseeLog.log(AtsPlugin.class, Level.SEVERE, ex);
-      }
-      return null;
-   }
-
-   @Override
-   public ConnectionAnchor getTargetConnectionAnchor(ConnectionEditPart connection) {
-      try {
-         return getConnectionAnchor();
-      } catch (OseeCoreException ex) {
-         OseeLog.log(AtsPlugin.class, Level.SEVERE, ex);
-      }
-      return null;
-   }
-
-   @Override
-   public ConnectionAnchor getTargetConnectionAnchor(Request request) {
-      try {
-         return getConnectionAnchor();
-      } catch (OseeCoreException ex) {
-         OseeLog.log(AtsPlugin.class, Level.SEVERE, ex);
-      }
-      return null;
-   }
-
-   @Override
-   public void propertyChange(PropertyChangeEvent evt) {
-      String prop = evt.getPropertyName();
-      if (Shape.SIZE_PROP.equals(prop) || Shape.LOCATION_PROP.equals(prop)) {
-         refreshVisuals();
-      } else if (Shape.SOURCE_CONNECTIONS_PROP.equals(prop)) {
-         refreshSourceConnections();
-      } else if (Shape.TARGET_CONNECTIONS_PROP.equals(prop)) {
-         refreshTargetConnections();
-      }
-   }
-
-   @Override
-   protected void refreshVisuals() {
-      // notify parent container of changed position & location
-      // if this line is removed, the XYLayoutManager used by the parent container
-      // (the Figure of the ShapesDiagramEditPart), will not know the bounds of this figure
-      // and will not draw it correctly.
-      Rectangle bounds = new Rectangle(getCastedModel().getLocation(), getCastedModel().getSize());
-      ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), bounds);
-   }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/parts/ShapeTreeEditPart.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/parts/ShapeTreeEditPart.java
deleted file mode 100644
index ccde5f0..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/parts/ShapeTreeEditPart.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.editor.parts;
-
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.editparts.AbstractTreeEditPart;
-import org.eclipse.osee.ats.workflow.editor.model.ModelElement;
-import org.eclipse.osee.ats.workflow.editor.model.Shape;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * TreeEditPart used for Shape instances (more specific for EllipticalShape and RectangularShape instances). This is
- * used in the Outline View of the ShapesEditor.
- * <p>
- * This edit part must implement the PropertyChangeListener interface, so it can be notified of property changes in the
- * corresponding model element.
- * </p>
- * 
- * @author Donald G. Dunne
- */
-class ShapeTreeEditPart extends AbstractTreeEditPart implements PropertyChangeListener {
-
-   /**
-    * Create a new instance of this edit part using the given model element.
-    * 
-    * @param model a non-null Shapes instance
-    */
-   ShapeTreeEditPart(Shape model) {
-      super(model);
-   }
-
-   /**
-    * Upon activation, attach to the model element as a property change listener.
-    */
-   @Override
-   public void activate() {
-      if (!isActive()) {
-         super.activate();
-         ((ModelElement) getModel()).addPropertyChangeListener(this);
-      }
-   }
-
-   @Override
-   protected void createEditPolicies() {
-      // allow removal of the associated model element
-      installEditPolicy(EditPolicy.COMPONENT_ROLE, new ShapeComponentEditPolicy());
-   }
-
-   /**
-    * Upon deactivation, detach from the model element as a property change listener.
-    */
-   @Override
-   public void deactivate() {
-      if (isActive()) {
-         super.deactivate();
-         ((ModelElement) getModel()).removePropertyChangeListener(this);
-      }
-   }
-
-   private Shape getCastedModel() {
-      return (Shape) getModel();
-   }
-
-   @Override
-   protected Image getImage() {
-      return getCastedModel().getIcon();
-   }
-
-   @Override
-   protected String getText() {
-      return getCastedModel().toString();
-   }
-
-   @Override
-   public void propertyChange(PropertyChangeEvent evt) {
-      refreshVisuals(); // this will cause an invocation of getImage() and getText(), see below
-   }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/parts/ShapesEditPartFactory.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/parts/ShapesEditPartFactory.java
deleted file mode 100644
index 4855fb3..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/parts/ShapesEditPartFactory.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.editor.parts;
-
-import java.util.logging.Level;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartFactory;
-import org.eclipse.osee.ats.internal.AtsPlugin;
-import org.eclipse.osee.ats.workflow.editor.model.CancelledWorkPageShape;
-import org.eclipse.osee.ats.workflow.editor.model.CompletedWorkPageShape;
-import org.eclipse.osee.ats.workflow.editor.model.Relation;
-import org.eclipse.osee.ats.workflow.editor.model.Shape;
-import org.eclipse.osee.ats.workflow.editor.model.WorkPageShape;
-import org.eclipse.osee.ats.workflow.editor.model.WorkflowDiagram;
-import org.eclipse.osee.framework.core.exception.OseeStateException;
-import org.eclipse.osee.framework.logging.OseeLog;
-
-/**
- * Factory that maps model elements to edit parts.
- * 
- * @author Donald G. Dunne
- */
-public class ShapesEditPartFactory implements EditPartFactory {
-
-   @Override
-   public EditPart createEditPart(EditPart context, Object modelElement) {
-      // get EditPart for model element
-      EditPart part = null;
-      try {
-         part = getPartForElement(modelElement);
-         // store model element in EditPart
-         part.setModel(modelElement);
-      } catch (OseeStateException ex) {
-         OseeLog.log(AtsPlugin.class, Level.SEVERE, ex);
-      }
-      return part;
-   }
-
-   /**
-    * Maps an object to an EditPart.
-    * 
-    * @throws RuntimeException if no match was found (programming error)
-    */
-   private EditPart getPartForElement(Object modelElement) throws OseeStateException {
-      if (modelElement instanceof WorkflowDiagram) {
-         return new DiagramEditPart();
-      }
-      if (modelElement instanceof CompletedWorkPageShape) {
-         return new WorkPageEditPart((CompletedWorkPageShape) modelElement);
-      }
-      if (modelElement instanceof CancelledWorkPageShape) {
-         return new WorkPageEditPart((CancelledWorkPageShape) modelElement);
-      }
-      if (modelElement instanceof WorkPageShape) {
-         return new WorkPageEditPart((WorkPageShape) modelElement);
-      }
-      if (modelElement instanceof Shape) {
-         return new ShapeEditPart();
-      }
-      if (modelElement instanceof Relation) {
-         return new ConnectionEditPart();
-      }
-      throw new OseeStateException(
-         "Can't create part for model element: " + (modelElement != null ? modelElement.getClass().getName() : "null"));
-   }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/parts/ShapesTreeEditPartFactory.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/parts/ShapesTreeEditPartFactory.java
deleted file mode 100644
index b0440fe..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/parts/ShapesTreeEditPartFactory.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.editor.parts;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartFactory;
-import org.eclipse.osee.ats.workflow.editor.model.Shape;
-import org.eclipse.osee.ats.workflow.editor.model.WorkflowDiagram;
-
-/**
- * Factory that maps model elements to TreeEditParts. TreeEditParts are used in the outline view of the ShapesEditor.
- * 
- * @author Donald G. Dunne
- */
-public class ShapesTreeEditPartFactory implements EditPartFactory {
-
-   @Override
-   public EditPart createEditPart(EditPart context, Object model) {
-      if (model instanceof Shape) {
-         return new ShapeTreeEditPart((Shape) model);
-      }
-      if (model instanceof WorkflowDiagram) {
-         return new DiagramTreeEditPart((WorkflowDiagram) model);
-      }
-      return null; // will not show an entry for the corresponding model instance
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/parts/WorkPageEditPart.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/parts/WorkPageEditPart.java
deleted file mode 100644
index ee9bd66..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/parts/WorkPageEditPart.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.editor.parts;
-
-import java.beans.PropertyChangeEvent;
-import java.util.logging.Level;
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.GridLayout;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.gef.ConnectionEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.SelectionRequest;
-import org.eclipse.osee.ats.internal.AtsPlugin;
-import org.eclipse.osee.ats.workflow.editor.actions.EditAction;
-import org.eclipse.osee.ats.workflow.editor.model.ReturnTransitionConnection;
-import org.eclipse.osee.ats.workflow.editor.model.WorkPageShape;
-import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.logging.OseeLog;
-
-/**
- * @author Donald G. Dunne
- */
-public class WorkPageEditPart extends ShapeEditPart {
-
-   private final WorkPageShape workPageShape;
-   private RightAnchor returnAnchor;
-   private Label label;
-
-   public WorkPageEditPart(WorkPageShape workPageShape) {
-      this.workPageShape = workPageShape;
-   }
-
-   @Override
-   protected IFigure createFigure() {
-      IFigure f = super.createFigure();
-      f.setLayoutManager(new GridLayout());
-      try {
-         if (workPageShape.isCompletedState()) {
-            f.setBackgroundColor(ColorConstants.darkGreen);
-         } else if (workPageShape.isCancelledState()) {
-            f.setBackgroundColor(ColorConstants.lightGray);
-         } else if (workPageShape.isStartPage()) {
-            f.setBackgroundColor(ColorConstants.yellow);
-         }
-      } catch (OseeCoreException ex) {
-         OseeLog.log(AtsPlugin.class, Level.SEVERE, ex);
-      }
-      label = new Label(workPageShape.getName());
-      f.add(label);
-      f.setToolTip(new Label(workPageShape.getToolTip()));
-      return f;
-   }
-
-   @Override
-   protected void refreshVisuals() {
-      super.refreshVisuals();
-      label.setText(workPageShape.getName());
-   }
-
-   @Override
-   public void performRequest(Request req) {
-      super.performRequest(req);
-      if (req instanceof SelectionRequest) {
-         new EditAction().run();
-      }
-   }
-
-   @Override
-   public void propertyChange(PropertyChangeEvent evt) {
-      super.propertyChange(evt);
-      String prop = evt.getPropertyName();
-      if (WorkPageShape.START_PAGE.equals(prop)) {
-         if (workPageShape.isStartPage()) {
-            getFigure().setBackgroundColor(ColorConstants.yellow);
-         } else {
-            getFigure().setBackgroundColor(ColorConstants.green);
-         }
-      }
-      if (CoreAttributeTypes.WorkPageName.getName().equals(prop)) {
-         refreshVisuals();
-      }
-   }
-
-   @Override
-   public ConnectionAnchor getTargetConnectionAnchor(ConnectionEditPart connection) {
-      if (connection.getModel() instanceof ReturnTransitionConnection) {
-         if (returnAnchor == null) {
-            returnAnchor = new RightAnchor(getFigure());
-         }
-         return returnAnchor;
-      }
-      return super.getTargetConnectionAnchor(connection);
-   }
-
-   @Override
-   public ConnectionAnchor getSourceConnectionAnchor(ConnectionEditPart connection) {
-      if (connection.getModel() instanceof ReturnTransitionConnection) {
-         if (returnAnchor == null) {
-            returnAnchor = new RightAnchor(getFigure());
-         }
-         return returnAnchor;
-      }
-      return super.getTargetConnectionAnchor(connection);
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/wizard/AtsWorkflowConfigCreationWizard.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/wizard/AtsWorkflowConfigCreationWizard.java
deleted file mode 100644
index 3e123b2..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/wizard/AtsWorkflowConfigCreationWizard.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.editor.wizard;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.osee.ats.artifact.AtsArtifactToken;
-import org.eclipse.osee.ats.config.AtsConfigManager;
-import org.eclipse.osee.ats.internal.AtsPlugin;
-import org.eclipse.osee.ats.util.AtsArtifactTypes;
-import org.eclipse.osee.ats.util.AtsUtil;
-import org.eclipse.osee.ats.workdef.WorkDefinition;
-import org.eclipse.osee.ats.workdef.provider.AtsWorkDefinitionProvider;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.logging.OseeLevel;
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
-import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
-import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
-import org.eclipse.osee.framework.ui.skynet.render.PresentationType;
-import org.eclipse.osee.framework.ui.skynet.render.RendererManager;
-import org.eclipse.osee.framework.ui.skynet.results.XResultData;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkFlowDefinition;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinitionFactory;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-
-/**
- * @author Donald G. Dunne
- */
-public class AtsWorkflowConfigCreationWizard extends Wizard implements INewWizard {
-
-   private NewWorkflowConfigPage1 page1;
-
-   @Override
-   public void addPages() {
-      addPage(page1);
-   }
-
-   @Override
-   public void init(IWorkbench workbench, IStructuredSelection selection) {
-      page1 = new NewWorkflowConfigPage1();
-   }
-
-   @Override
-   public boolean performFinish() {
-
-      try {
-         final String workDefName = page1.getWorkDefName();
-         try {
-            if (WorkItemDefinitionFactory.getWorkItemDefinition(workDefName) != null) {
-               AWorkbench.popup("ERROR", "Namespace already used, choose a unique namespace.");
-               return false;
-            }
-         } catch (OseeCoreException ex) {
-            // do nothing
-         }
-         SkynetTransaction transaction = new SkynetTransaction(AtsUtil.getAtsBranch(), "ATS Config Wizard");
-         WorkDefinition workDef = null;
-         XResultData resultData = new XResultData();
-         workDef = AtsConfigManager.generateDefaultWorkflow(workDefName, resultData, transaction, null);
-
-         Artifact workDefArt =
-            AtsWorkDefinitionProvider.get().importWorkDefinitionToDb(workDef, workDefName, resultData, transaction);
-
-         Artifact folder = AtsUtil.getFromToken(AtsArtifactToken.WorkDefinitionsFolder);
-         folder.addChild(workDefArt);
-         folder.persist(transaction);
-
-         transaction.execute();
-
-         Artifact artifact =
-            ArtifactQuery.getArtifactFromTypeAndName(AtsArtifactTypes.WorkDefinition, workDefName,
-               AtsUtil.getAtsBranch());
-         RendererManager.open(artifact, PresentationType.SPECIALIZED_EDIT);
-      } catch (Exception ex) {
-         OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
-      }
-      return true;
-
-   }
-   public static class WorkflowData {
-      private final WorkFlowDefinition workDefinition;
-      private final Artifact workFlowArtifact;
-
-      public WorkflowData(WorkFlowDefinition workDefinition, Artifact workFlowArtifact) {
-         this.workDefinition = workDefinition;
-         this.workFlowArtifact = workFlowArtifact;
-      }
-
-      /**
-       * @return the workDefinition
-       */
-      public WorkFlowDefinition getWorkDefinition() {
-         return workDefinition;
-      }
-
-      /**
-       * @return the workFlowArtifact
-       */
-      public Artifact getWorkFlowArtifact() {
-         return workFlowArtifact;
-      }
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/wizard/NewWorkflowConfigPage1.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/wizard/NewWorkflowConfigPage1.java
deleted file mode 100644
index e3b15be..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/wizard/NewWorkflowConfigPage1.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.osee.ats.workflow.editor.wizard;
-
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.osee.ats.internal.AtsPlugin;
-import org.eclipse.osee.ats.workflow.ATSXWidgetOptionResolver;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.util.Conditions;
-import org.eclipse.osee.framework.logging.OseeLevel;
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.ui.skynet.widgets.XModifiedListener;
-import org.eclipse.osee.framework.ui.skynet.widgets.XText;
-import org.eclipse.osee.framework.ui.skynet.widgets.XWidget;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * @author Donald G. Dunne
- */
-public class NewWorkflowConfigPage1 extends WizardPage {
-   private WorkPage page;
-
-   public NewWorkflowConfigPage1() {
-      super("Create new ATS Workflow Configuration", "Create ATS Workflow Configuration", null);
-      setMessage("Enter Work Definition name.");
-   }
-
-   private final XModifiedListener xModListener = new XModifiedListener() {
-      @Override
-      public void widgetModified(XWidget widget) {
-         getContainer().updateButtons();
-      }
-   };
-
-   public String getWorkDefName() throws OseeCoreException {
-      return (String) getXWidget("Name").getData();
-   }
-
-   @Override
-   public void createControl(Composite parent) {
-
-      try {
-         String xWidgetXml = "<WorkPage>" +
-         //
-         "<XWidget displayName=\"Name\" required=\"true\" xwidgetType=\"XText\"/>" +
-         //
-         "</WorkPage>";
-         Composite comp = new Composite(parent, SWT.NONE);
-         comp.setLayout(new GridLayout(1, false));
-         comp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-         page = new WorkPage(xWidgetXml, ATSXWidgetOptionResolver.getInstance());
-         page.createBody(null, comp, null, xModListener, true);
-
-         setControl(comp);
-         ((XText) getXWidget("Name")).setFocus();
-      } catch (Exception ex) {
-         OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
-      }
-   }
-
-   public XWidget getXWidget(String attrName) throws OseeCoreException {
-      Conditions.checkNotNull(page, "WorkPage");
-      return page.getLayoutData(attrName).getXWidget();
-   }
-
-   @Override
-   public boolean isPageComplete() {
-      if (!page.isPageComplete().isTrue()) {
-         return false;
-      }
-
-      return true;
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/flow/DecisionWorkflowDefinition.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/flow/DecisionWorkflowDefinition.java
deleted file mode 100644
index ded9b2b..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/flow/DecisionWorkflowDefinition.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.flow;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.eclipse.osee.ats.util.TeamState;
-import org.eclipse.osee.ats.workflow.item.AtsStatePercentCompleteWeightDecisionReviewRule;
-import org.eclipse.osee.ats.workflow.item.AtsWorkDefinitions;
-import org.eclipse.osee.ats.workflow.page.AtsCancelledWorkPageDefinition;
-import org.eclipse.osee.ats.workflow.page.AtsDecisionCompletedWorkPageDefinition;
-import org.eclipse.osee.ats.workflow.page.AtsDecisionDecisionWorkPageDefinition;
-import org.eclipse.osee.ats.workflow.page.AtsDecisionFollowupWorkPageDefinition;
-import org.eclipse.osee.ats.workflow.page.AtsDecisionPrepareWorkPageDefinition;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.exception.OseeStateException;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.ui.skynet.results.XResultData;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkFlowDefinition;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinition;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinition;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageType;
-
-/**
- * @author Donald G. Dunne
- */
-public class DecisionWorkflowDefinition extends WorkFlowDefinition {
-
-   public final static String ID = "osee.ats.decisionReview";
-   public final static String DECISION_CANCELLED_STATE_ID = ID + "." + TeamState.Cancelled.getPageName();
-
-   public DecisionWorkflowDefinition() {
-      super(ID, ID, null);
-      addTransitions();
-      startPageId = AtsDecisionPrepareWorkPageDefinition.ID;
-      addWorkItem(AtsStatePercentCompleteWeightDecisionReviewRule.ID);
-   }
-
-   public DecisionWorkflowDefinition(Artifact artifact) throws OseeCoreException {
-      super(artifact);
-      throw new OseeStateException("This constructor should never be used.");
-   }
-
-   public void config(WriteType writeType, XResultData xResultData) throws OseeCoreException {
-      AtsWorkDefinitions.importWorkItemDefinitionsIntoDb(writeType, xResultData, getAtsWorkDefinitions());
-   }
-
-   public static List<WorkItemDefinition> getAtsWorkDefinitions() {
-      List<WorkItemDefinition> workItems = new ArrayList<WorkItemDefinition>();
-
-      // Add Decision Pages and Workflow Definition
-      workItems.add(new AtsDecisionPrepareWorkPageDefinition(1));
-      workItems.add(new AtsDecisionDecisionWorkPageDefinition(2));
-      workItems.add(new AtsDecisionFollowupWorkPageDefinition(3));
-      workItems.add(new AtsDecisionCompletedWorkPageDefinition(4));
-      workItems.add(new WorkPageDefinition(TeamState.Cancelled.getPageName(),
-         DecisionWorkflowDefinition.DECISION_CANCELLED_STATE_ID, AtsCancelledWorkPageDefinition.ID,
-         WorkPageType.Cancelled, 5));
-
-      workItems.add(new DecisionWorkflowDefinition());
-
-      return workItems;
-   }
-
-   private void addTransitions() {
-      // Add Prepare Transitions
-      addPageTransition(AtsDecisionPrepareWorkPageDefinition.ID, AtsDecisionDecisionWorkPageDefinition.ID,
-         TransitionType.ToPageAsDefault);
-      addPageTransitionToPageAndReturn(AtsDecisionPrepareWorkPageDefinition.ID, DECISION_CANCELLED_STATE_ID);
-
-      // Add Decision Transitions
-      addPageTransition(AtsDecisionDecisionWorkPageDefinition.ID, AtsDecisionCompletedWorkPageDefinition.ID,
-         TransitionType.ToPageAsDefault);
-      addPageTransition(AtsDecisionDecisionWorkPageDefinition.ID, AtsDecisionFollowupWorkPageDefinition.ID,
-         TransitionType.ToPage);
-      addPageTransition(AtsDecisionDecisionWorkPageDefinition.ID, AtsDecisionPrepareWorkPageDefinition.ID,
-         TransitionType.ToPageAsReturn);
-      addPageTransitionToPageAndReturn(AtsDecisionDecisionWorkPageDefinition.ID, DECISION_CANCELLED_STATE_ID);
-
-      // Add Followup Transitions
-      addPageTransition(AtsDecisionFollowupWorkPageDefinition.ID, AtsDecisionDecisionWorkPageDefinition.ID,
-         TransitionType.ToPageAsReturn);
-      addPageTransition(AtsDecisionFollowupWorkPageDefinition.ID, AtsDecisionCompletedWorkPageDefinition.ID,
-         TransitionType.ToPageAsDefault);
-      addPageTransitionToPageAndReturn(AtsDecisionFollowupWorkPageDefinition.ID, DECISION_CANCELLED_STATE_ID);
-
-      // Add Completed Transitions
-      addPageTransition(AtsDecisionCompletedWorkPageDefinition.ID, AtsDecisionDecisionWorkPageDefinition.ID,
-         TransitionType.ToPageAsReturn);
-      addPageTransition(AtsDecisionCompletedWorkPageDefinition.ID, AtsDecisionFollowupWorkPageDefinition.ID,
-         TransitionType.ToPageAsReturn);
-
-      // Add Cancelled Transitions
-      addPageTransition(DECISION_CANCELLED_STATE_ID, AtsDecisionPrepareWorkPageDefinition.ID,
-         TransitionType.ToPageAsReturn);
-      addPageTransition(DECISION_CANCELLED_STATE_ID, AtsDecisionDecisionWorkPageDefinition.ID,
-         TransitionType.ToPageAsReturn);
-      addPageTransition(DECISION_CANCELLED_STATE_ID, AtsDecisionFollowupWorkPageDefinition.ID,
-         TransitionType.ToPageAsReturn);
-
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/flow/GoalWorkflowDefinition.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/flow/GoalWorkflowDefinition.java
deleted file mode 100644
index 5f87915..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/flow/GoalWorkflowDefinition.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.flow;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.eclipse.osee.ats.artifact.GoalState;
-import org.eclipse.osee.ats.workflow.item.AtsWorkDefinitions;
-import org.eclipse.osee.ats.workflow.page.AtsCancelledWorkPageDefinition;
-import org.eclipse.osee.ats.workflow.page.AtsCompletedWorkPageDefinition;
-import org.eclipse.osee.ats.workflow.page.AtsGoalInWorkPageDefinition;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.exception.OseeStateException;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.ui.skynet.results.XResultData;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkFlowDefinition;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinition;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinition;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageType;
-
-public class GoalWorkflowDefinition extends WorkFlowDefinition {
-
-   public final static String ID = "osee.ats.goalWorkflow";
-
-   public GoalWorkflowDefinition() {
-      this(ID, ID);
-      startPageId = GoalState.InWork.getPageName();
-   }
-
-   public GoalWorkflowDefinition(Artifact artifact) throws OseeCoreException {
-      super(artifact);
-      throw new OseeStateException("This constructor should never be used.");
-   }
-
-   public void config(WriteType writeType, XResultData xResultData) throws OseeCoreException {
-      AtsWorkDefinitions.importWorkItemDefinitionsIntoDb(writeType, xResultData, getAtsWorkDefinitions());
-   }
-
-   public static List<WorkItemDefinition> getAtsWorkDefinitions() {
-      List<WorkItemDefinition> workItems = new ArrayList<WorkItemDefinition>();
-
-      // Add Task Page and Workflow Definition
-      workItems.add(new AtsGoalInWorkPageDefinition(1));
-      workItems.add(new WorkPageDefinition(GoalState.Completed.getPageName(),
-         ID + "." + GoalState.Completed.getPageName(), AtsCompletedWorkPageDefinition.ID, WorkPageType.Completed, 2));
-      workItems.add(new WorkPageDefinition(GoalState.Cancelled.getPageName(),
-         ID + "." + GoalState.Cancelled.getPageName(), AtsCancelledWorkPageDefinition.ID, WorkPageType.Cancelled, 3));
-      workItems.add(new GoalWorkflowDefinition());
-
-      return workItems;
-   }
-
-   public GoalWorkflowDefinition(String name, String id) {
-      super(name, id, null);
-      addPageTransition(GoalState.InWork.getPageName(), GoalState.Completed.getPageName(),
-         TransitionType.ToPageAsDefault);
-
-      // Add return transitions
-      addPageTransition(GoalState.Completed.getPageName(), GoalState.InWork.getPageName(),
-         TransitionType.ToPageAsReturn);
-
-      // Add cancelled transitions
-      addPageTransitionToPageAndReturn(GoalState.InWork.getPageName(), GoalState.Cancelled.getPageName());
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/flow/PeerToPeerWorkflowDefinition.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/flow/PeerToPeerWorkflowDefinition.java
deleted file mode 100644
index 4966e87..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/flow/PeerToPeerWorkflowDefinition.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.flow;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.eclipse.osee.ats.util.TeamState;
-import org.eclipse.osee.ats.workflow.item.AtsStatePercentCompleteWeightPeerToPeerReviewRule;
-import org.eclipse.osee.ats.workflow.item.AtsWorkDefinitions;
-import org.eclipse.osee.ats.workflow.page.AtsCancelledWorkPageDefinition;
-import org.eclipse.osee.ats.workflow.page.AtsCompletedWorkPageDefinition;
-import org.eclipse.osee.ats.workflow.page.AtsPeerPrepareWorkPageDefinition;
-import org.eclipse.osee.ats.workflow.page.AtsPeerReviewWorkPageDefinition;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.exception.OseeStateException;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.ui.skynet.results.XResultData;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkFlowDefinition;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinition;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinition;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageType;
-
-/**
- * @author Donald G. Dunne
- */
-public class PeerToPeerWorkflowDefinition extends WorkFlowDefinition {
-
-   public final static String ID = "osee.ats.peerToPeerReview";
-   public final static String PEER_REVIEW_COMPLETED_STATE_ID = ID + "." + TeamState.Completed.getPageName();
-   public final static String PEER_REVIEW_CANCELLED_STATE_ID = ID + "." + TeamState.Cancelled.getPageName();
-
-   public PeerToPeerWorkflowDefinition() {
-      super(ID, ID, null);
-      addTransitions();
-      startPageId = AtsPeerPrepareWorkPageDefinition.ID;
-      addWorkItem(AtsStatePercentCompleteWeightPeerToPeerReviewRule.ID);
-   }
-
-   public PeerToPeerWorkflowDefinition(Artifact artifact) throws OseeCoreException {
-      super(artifact);
-      throw new OseeStateException("This constructor should never be used.");
-   }
-
-   public void config(WriteType writeType, XResultData xResultData) throws OseeCoreException {
-      AtsWorkDefinitions.importWorkItemDefinitionsIntoDb(writeType, xResultData, getAtsWorkDefinitions());
-   }
-
-   public static List<WorkItemDefinition> getAtsWorkDefinitions() {
-      List<WorkItemDefinition> workItems = new ArrayList<WorkItemDefinition>();
-
-      // Add PeerToPeer Pages and Workflow Definition
-      workItems.add(new AtsPeerPrepareWorkPageDefinition(1));
-      workItems.add(new AtsPeerReviewWorkPageDefinition(2));
-      workItems.add(new WorkPageDefinition(TeamState.Completed.getPageName(),
-         PeerToPeerWorkflowDefinition.PEER_REVIEW_COMPLETED_STATE_ID, AtsCompletedWorkPageDefinition.ID,
-         WorkPageType.Completed, 3));
-      workItems.add(new WorkPageDefinition(TeamState.Cancelled.getPageName(),
-         PeerToPeerWorkflowDefinition.PEER_REVIEW_CANCELLED_STATE_ID, AtsCancelledWorkPageDefinition.ID,
-         WorkPageType.Cancelled, 4));
-      workItems.add(new PeerToPeerWorkflowDefinition());
-
-      return workItems;
-   }
-
-   private void addTransitions() {
-      // Add default transitions
-      addPageTransition(AtsPeerPrepareWorkPageDefinition.ID, AtsPeerReviewWorkPageDefinition.ID,
-         TransitionType.ToPageAsDefault);
-      addPageTransition(AtsPeerReviewWorkPageDefinition.ID, PEER_REVIEW_COMPLETED_STATE_ID,
-         TransitionType.ToPageAsDefault);
-
-      // Add return transitions
-      addPageTransition(PEER_REVIEW_COMPLETED_STATE_ID, AtsPeerReviewWorkPageDefinition.ID,
-         TransitionType.ToPageAsReturn);
-      addPageTransition(AtsPeerReviewWorkPageDefinition.ID, AtsPeerPrepareWorkPageDefinition.ID,
-         TransitionType.ToPageAsReturn);
-      addPageTransition(PEER_REVIEW_CANCELLED_STATE_ID, AtsPeerReviewWorkPageDefinition.ID,
-         TransitionType.ToPageAsReturn);
-      addPageTransition(PEER_REVIEW_CANCELLED_STATE_ID, AtsPeerPrepareWorkPageDefinition.ID,
-         TransitionType.ToPageAsReturn);
-
-      // Add cancelled transitions
-      addPageTransitionToPageAndReturn(AtsPeerPrepareWorkPageDefinition.ID, PEER_REVIEW_CANCELLED_STATE_ID);
-      addPageTransitionToPageAndReturn(AtsPeerReviewWorkPageDefinition.ID, PEER_REVIEW_CANCELLED_STATE_ID);
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/flow/SimpleWorkflowDefinition.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/flow/SimpleWorkflowDefinition.java
deleted file mode 100644
index 36922dc..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/flow/SimpleWorkflowDefinition.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.flow;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.eclipse.osee.ats.util.TeamState;
-import org.eclipse.osee.ats.workflow.item.AtsStatePercentCompleteWeightSimpleWorkflowRule;
-import org.eclipse.osee.ats.workflow.item.AtsWorkDefinitions;
-import org.eclipse.osee.ats.workflow.page.AtsCancelledWorkPageDefinition;
-import org.eclipse.osee.ats.workflow.page.AtsCompletedWorkPageDefinition;
-import org.eclipse.osee.ats.workflow.page.AtsEndorseWorkPageDefinition;
-import org.eclipse.osee.ats.workflow.page.AtsSimpleInWorkWorkPageDefinition;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.exception.OseeStateException;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.ui.skynet.results.XResultData;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkFlowDefinition;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinition;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinition;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageType;
-
-/**
- * @author Donald G. Dunne
- */
-public class SimpleWorkflowDefinition extends WorkFlowDefinition {
-
-   public final static String ID = "osee.ats.simpleTeamWorkflow";
-   public static enum SimpleState {
-      Endorse,
-      InWork,
-      Completed,
-      Cancelled
-   };
-   public final static String ENDORSE_STATE_ID = ID + "." + SimpleState.Endorse.name();
-   public final static String INWORK_STATE_ID = ID + "." + SimpleState.InWork.name();
-   public final static String COMPLETED_STATE_ID = ID + "." + SimpleState.Completed.name();
-   public final static String CANCELLED_STATE_ID = ID + "." + SimpleState.Cancelled.name();
-
-   public SimpleWorkflowDefinition(Artifact artifact) throws OseeCoreException {
-      super(artifact);
-      throw new OseeStateException("This constructor should never be used.");
-   }
-
-   public SimpleWorkflowDefinition() {
-      this(ID, ID);
-      addWorkItem(AtsStatePercentCompleteWeightSimpleWorkflowRule.ID);
-   }
-
-   public SimpleWorkflowDefinition(String name, String workflowId) {
-      super(name, workflowId, null);
-      addDefaultTransitions(this, workflowId);
-      startPageId = SimpleState.Endorse.name();
-   }
-
-   public void config(WriteType writeType, XResultData xResultData) throws OseeCoreException {
-      AtsWorkDefinitions.importWorkItemDefinitionsIntoDb(writeType, xResultData, getAtsWorkDefinitions());
-   }
-
-   public static void addDefaultTransitions(WorkFlowDefinition teamWorkflowDefinition, String workflowId) {
-      teamWorkflowDefinition.addPageTransition(SimpleState.Endorse.name(), SimpleState.InWork.name(),
-         TransitionType.ToPageAsDefault);
-      teamWorkflowDefinition.addPageTransition(SimpleState.InWork.name(), SimpleState.Completed.name(),
-         TransitionType.ToPageAsDefault);
-
-      // Add return transitions
-      teamWorkflowDefinition.addPageTransition(SimpleState.InWork.name(), SimpleState.Endorse.name(),
-         TransitionType.ToPageAsReturn);
-      teamWorkflowDefinition.addPageTransition(SimpleState.Completed.name(), SimpleState.InWork.name(),
-         TransitionType.ToPageAsReturn);
-
-      // Add cancelled transitions
-      teamWorkflowDefinition.addPageTransitionToPageAndReturn(SimpleState.Endorse.name(), SimpleState.Cancelled.name());
-      teamWorkflowDefinition.addPageTransitionToPageAndReturn(SimpleState.InWork.name(), SimpleState.Cancelled.name());
-   }
-
-   public static List<WorkItemDefinition> getAtsWorkDefinitions() {
-      List<WorkItemDefinition> workItems = new ArrayList<WorkItemDefinition>();
-
-      workItems.add(new WorkPageDefinition(SimpleState.Endorse.name(), SimpleWorkflowDefinition.ENDORSE_STATE_ID,
-         AtsEndorseWorkPageDefinition.ID, WorkPageType.Working, 1));
-      workItems.add(new AtsSimpleInWorkWorkPageDefinition(2));
-      workItems.add(new WorkPageDefinition(TeamState.Completed.getPageName(),
-         SimpleWorkflowDefinition.COMPLETED_STATE_ID, AtsCompletedWorkPageDefinition.ID, WorkPageType.Completed, 3));
-      workItems.add(new WorkPageDefinition(TeamState.Cancelled.getPageName(),
-         SimpleWorkflowDefinition.CANCELLED_STATE_ID, AtsCancelledWorkPageDefinition.ID, WorkPageType.Cancelled, 4));
-      workItems.add(new SimpleWorkflowDefinition());
-
-      return workItems;
-   }
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/flow/TaskWorkflowDefinition.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/flow/TaskWorkflowDefinition.java
deleted file mode 100644
index ad3a38f..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/flow/TaskWorkflowDefinition.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.flow;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.eclipse.osee.ats.artifact.TaskStates;
-import org.eclipse.osee.ats.util.TeamState;
-import org.eclipse.osee.ats.workflow.item.AtsWorkDefinitions;
-import org.eclipse.osee.ats.workflow.page.AtsCancelledWorkPageDefinition;
-import org.eclipse.osee.ats.workflow.page.AtsCompletedWorkPageDefinition;
-import org.eclipse.osee.ats.workflow.page.AtsTaskInWorkPageDefinition;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.exception.OseeStateException;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.ui.skynet.results.XResultData;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkFlowDefinition;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinition;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinition;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageType;
-
-/**
- * @author Donald G. Dunne
- */
-public class TaskWorkflowDefinition extends WorkFlowDefinition {
-
-   public final static String ID = "osee.ats.taskWorkflow";
-
-   public TaskWorkflowDefinition() {
-      this(ID, ID);
-      startPageId = TaskStates.InWork.getPageName();
-   }
-
-   public TaskWorkflowDefinition(Artifact artifact) throws OseeCoreException {
-      super(artifact);
-      throw new OseeStateException("This constructor should never be used.");
-   }
-
-   public void config(WriteType writeType, XResultData xResultData) throws OseeCoreException {
-      AtsWorkDefinitions.importWorkItemDefinitionsIntoDb(writeType, xResultData, getAtsWorkDefinitions());
-   }
-
-   public static List<WorkItemDefinition> getAtsWorkDefinitions() {
-      List<WorkItemDefinition> workItems = new ArrayList<WorkItemDefinition>();
-
-      // Add Task Page and Workflow Definition
-      workItems.add(new AtsTaskInWorkPageDefinition(1));
-      workItems.add(new WorkPageDefinition(TeamState.Completed.getPageName(),
-         ID + "." + TaskStates.Completed.getPageName(), AtsCompletedWorkPageDefinition.ID, WorkPageType.Completed, 2));
-      workItems.add(new WorkPageDefinition(TeamState.Cancelled.getPageName(),
-         ID + "." + TaskStates.Cancelled.getPageName(), AtsCancelledWorkPageDefinition.ID, WorkPageType.Cancelled, 3));
-      workItems.add(new TaskWorkflowDefinition());
-
-      return workItems;
-   }
-
-   public TaskWorkflowDefinition(String name, String id) {
-      super(name, id, null);
-      addPageTransition(TaskStates.InWork.getPageName(), TaskStates.Completed.getPageName(),
-         TransitionType.ToPageAsDefault);
-
-      // Add return transitions
-      addPageTransition(TaskStates.Completed.getPageName(), TaskStates.InWork.getPageName(),
-         TransitionType.ToPageAsReturn);
-
-      // Add cancelled transitions
-      addPageTransitionToPageAndReturn(TaskStates.InWork.getPageName(), TaskStates.Cancelled.getPageName());
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/flow/TeamWorkflowDefinition.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/flow/TeamWorkflowDefinition.java
deleted file mode 100644
index b6b9fed..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/flow/TeamWorkflowDefinition.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.flow;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.eclipse.osee.ats.util.TeamState;
-import org.eclipse.osee.ats.workflow.item.AtsStatePercentCompleteWeightDefaultWorkflowRule;
-import org.eclipse.osee.ats.workflow.item.AtsWorkDefinitions;
-import org.eclipse.osee.ats.workflow.page.AtsAnalyzeWorkPageDefinition;
-import org.eclipse.osee.ats.workflow.page.AtsAuthorizeWorkPageDefinition;
-import org.eclipse.osee.ats.workflow.page.AtsCancelledWorkPageDefinition;
-import org.eclipse.osee.ats.workflow.page.AtsCompletedWorkPageDefinition;
-import org.eclipse.osee.ats.workflow.page.AtsEndorseWorkPageDefinition;
-import org.eclipse.osee.ats.workflow.page.AtsImplementWorkPageDefinition;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.exception.OseeStateException;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.ui.skynet.results.XResultData;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkFlowDefinition;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinition;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinition;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageType;
-
-/**
- * @author Donald G. Dunne
- */
-public class TeamWorkflowDefinition extends WorkFlowDefinition {
-
-   public final static String ID = "osee.ats.teamWorkflow";
-
-   public TeamWorkflowDefinition() {
-      this(ID, ID);
-      addWorkItem(AtsStatePercentCompleteWeightDefaultWorkflowRule.ID);
-   }
-
-   public TeamWorkflowDefinition(Artifact artifact) throws OseeCoreException {
-      super(artifact);
-      throw new OseeStateException("This constructor should never be used.");
-   }
-
-   /**
-    * Instantiate workflow as inherited from parentWorkflowId. Default transitions and startPageId are not set as they
-    * will most likely come from parent.
-    */
-   public TeamWorkflowDefinition(String name, String workflowId, String parentWorkflowId) {
-      super(name, workflowId, parentWorkflowId);
-   }
-
-   public void config(WriteType writeType, XResultData xResultData) throws OseeCoreException {
-      AtsWorkDefinitions.importWorkItemDefinitionsIntoDb(writeType, xResultData, getAtsWorkDefinitions());
-   }
-
-   /**
-    * Instantiate workflow as a TeamWorkflowDefinition with default transitions and startPageId set.
-    */
-   public TeamWorkflowDefinition(String name, String workflowId) {
-      super(name, workflowId, null);
-      addDefaultTransitions(this, workflowId);
-      startPageId = TeamState.Endorse.getPageName();
-   }
-
-   public static List<WorkItemDefinition> getAtsWorkDefinitions() {
-      List<WorkItemDefinition> workItems = new ArrayList<WorkItemDefinition>();
-
-      // Add Team Page and Workflow Definition
-      workItems.add(new AtsEndorseWorkPageDefinition(1));
-      workItems.add(new AtsAnalyzeWorkPageDefinition(2));
-      workItems.add(new AtsAuthorizeWorkPageDefinition(3));
-      workItems.add(new AtsImplementWorkPageDefinition(4));
-      workItems.add(new AtsCompletedWorkPageDefinition(5));
-      workItems.add(new AtsCancelledWorkPageDefinition(6));
-      workItems.add(new TeamWorkflowDefinition());
-
-      return workItems;
-   }
-
-   public static List<WorkItemDefinition> getWorkPageDefinitionsForId(String workflowId) {
-      List<WorkItemDefinition> workItems = new ArrayList<WorkItemDefinition>();
-      // Add Team Page and Workflow Definition
-      workItems.add(new WorkPageDefinition(TeamState.Endorse.getPageName(),
-         workflowId + "." + TeamState.Endorse.getPageName(), AtsEndorseWorkPageDefinition.ID, WorkPageType.Working, 1));
-      workItems.add(new WorkPageDefinition(TeamState.Analyze.getPageName(),
-         workflowId + "." + TeamState.Analyze.getPageName(), AtsAnalyzeWorkPageDefinition.ID, WorkPageType.Working, 2));
-      workItems.add(new WorkPageDefinition(TeamState.Authorize.getPageName(),
-         workflowId + "." + TeamState.Authorize.getPageName(), AtsAuthorizeWorkPageDefinition.ID, WorkPageType.Working,
-         3));
-      workItems.add(new WorkPageDefinition(TeamState.Implement.getPageName(),
-         workflowId + "." + TeamState.Implement.getPageName(), AtsImplementWorkPageDefinition.ID, WorkPageType.Working,
-         4));
-      workItems.add(new WorkPageDefinition(TeamState.Completed.getPageName(),
-         workflowId + "." + TeamState.Completed.getPageName(), AtsCompletedWorkPageDefinition.ID,
-         WorkPageType.Completed, 5));
-      workItems.add(new WorkPageDefinition(TeamState.Cancelled.getPageName(),
-         workflowId + "." + TeamState.Cancelled.getPageName(), AtsCancelledWorkPageDefinition.ID,
-         WorkPageType.Cancelled, 6));
-      return workItems;
-   }
-
-   public static void addDefaultTransitions(WorkFlowDefinition teamWorkflowDefinition, String workflowId) {
-      teamWorkflowDefinition.addPageTransition(TeamState.Endorse.getPageName(), TeamState.Analyze.getPageName(),
-         TransitionType.ToPageAsDefault);
-      teamWorkflowDefinition.addPageTransition(TeamState.Analyze.getPageName(), TeamState.Authorize.getPageName(),
-         TransitionType.ToPageAsDefault);
-      teamWorkflowDefinition.addPageTransition(TeamState.Authorize.getPageName(), TeamState.Implement.getPageName(),
-         TransitionType.ToPageAsDefault);
-      teamWorkflowDefinition.addPageTransition(TeamState.Implement.getPageName(), TeamState.Completed.getPageName(),
-         TransitionType.ToPageAsDefault);
-
-      // Add return transitions
-      teamWorkflowDefinition.addPageTransition(TeamState.Analyze.getPageName(), TeamState.Endorse.getPageName(),
-         TransitionType.ToPageAsReturn);
-      teamWorkflowDefinition.addPageTransition(TeamState.Authorize.getPageName(), TeamState.Analyze.getPageName(),
-         TransitionType.ToPageAsReturn);
-      teamWorkflowDefinition.addPageTransition(TeamState.Implement.getPageName(), TeamState.Analyze.getPageName(),
-         TransitionType.ToPageAsReturn);
-      teamWorkflowDefinition.addPageTransition(TeamState.Implement.getPageName(), TeamState.Authorize.getPageName(),
-         TransitionType.ToPageAsReturn);
-      teamWorkflowDefinition.addPageTransition(TeamState.Completed.getPageName(), TeamState.Implement.getPageName(),
-         TransitionType.ToPageAsReturn);
-
-      // Add cancelled transitions
-      teamWorkflowDefinition.addPageTransitionToPageAndReturn(TeamState.Endorse.getPageName(),
-         TeamState.Cancelled.getPageName());
-      teamWorkflowDefinition.addPageTransitionToPageAndReturn(TeamState.Analyze.getPageName(),
-         TeamState.Cancelled.getPageName());
-      teamWorkflowDefinition.addPageTransitionToPageAndReturn(TeamState.Authorize.getPageName(),
-         TeamState.Cancelled.getPageName());
-      teamWorkflowDefinition.addPageTransitionToPageAndReturn(TeamState.Implement.getPageName(),
-         TeamState.Cancelled.getPageName());
-   }
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsAddDecisionReviewRule.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsAddDecisionReviewRule.java
index 6ae650f..90e8045 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsAddDecisionReviewRule.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsAddDecisionReviewRule.java
@@ -13,11 +13,9 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Date;
-import java.util.logging.Level;
 import org.eclipse.osee.ats.artifact.DecisionReviewArtifact;
 import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.artifact.log.LogType;
-import org.eclipse.osee.ats.internal.AtsPlugin;
 import org.eclipse.osee.ats.util.widgets.ReviewManager;
 import org.eclipse.osee.ats.workdef.DecisionReviewDefinition;
 import org.eclipse.osee.ats.workdef.ReviewBlockType;
@@ -25,7 +23,6 @@
 import org.eclipse.osee.ats.workdef.StateEventType;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.jdk.core.util.Strings;
-import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.framework.skynet.core.User;
 import org.eclipse.osee.framework.skynet.core.UserManager;
 import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
@@ -36,7 +33,7 @@
 /**
  * @author Donald G. Dunne
  */
-public class AtsAddDecisionReviewRule extends WorkRuleDefinition {
+public class AtsAddDecisionReviewRule {
 
    public final static String ID = "atsAddDecisionReview";
    public static enum DecisionParameter {
@@ -54,25 +51,6 @@
       TransitionToDecision
    }
 
-   public AtsAddDecisionReviewRule() {
-      this(ID, ID);
-   }
-
-   public AtsAddDecisionReviewRule(String name, String id) {
-      super(name, id);
-      setDescription("Work Page and Team Definition Option: Decision Review will be auto-created based on WorkData attribute values.");
-      setDecisionParameterValue(this, DecisionParameter.title, "Enter Title Here");
-      setDecisionParameterValue(this, DecisionParameter.reviewBlockingType, "Transition");
-      setDecisionParameterValue(this, DecisionParameter.forState, "Implement");
-      setDecisionParameterValue(this, DecisionParameter.forEvent, StateEventType.TransitionTo.name());
-      try {
-         setDecisionParameterValue(this, DecisionParameter.assignees, "<99999997>");
-         setDecisionParameterValue(this, DecisionParameter.options, "Completed;Completed;");
-      } catch (Exception ex) {
-         OseeLog.log(AtsPlugin.class, Level.SEVERE, ex);
-      }
-   }
-
    public static void setDecisionParameterValue(WorkRuleDefinition workRuleDefinition, DecisionParameter decisionParameter, String value) {
       workRuleDefinition.addWorkDataKeyValue(decisionParameter.name(), value);
    }
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsAddPeerToPeerReviewRule.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsAddPeerToPeerReviewRule.java
index ab04ef7..4887896 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsAddPeerToPeerReviewRule.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsAddPeerToPeerReviewRule.java
@@ -13,12 +13,10 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Date;
-import java.util.logging.Level;
 import org.eclipse.osee.ats.artifact.AtsAttributeTypes;
 import org.eclipse.osee.ats.artifact.PeerToPeerReviewArtifact;
 import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.artifact.log.LogType;
-import org.eclipse.osee.ats.internal.AtsPlugin;
 import org.eclipse.osee.ats.util.widgets.ReviewManager;
 import org.eclipse.osee.ats.workdef.PeerReviewDefinition;
 import org.eclipse.osee.ats.workdef.ReviewBlockType;
@@ -26,7 +24,6 @@
 import org.eclipse.osee.ats.workdef.StateEventType;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.jdk.core.util.Strings;
-import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.framework.skynet.core.User;
 import org.eclipse.osee.framework.skynet.core.UserManager;
 import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
@@ -37,7 +34,7 @@
 /**
  * @author Donald G. Dunne
  */
-public class AtsAddPeerToPeerReviewRule extends WorkRuleDefinition {
+public class AtsAddPeerToPeerReviewRule {
 
    public final static String ID = "atsAddPeerToPeerReview";
    public static enum PeerToPeerParameter {
@@ -50,23 +47,6 @@
       description
    };
 
-   public AtsAddPeerToPeerReviewRule() {
-      this(ID, ID);
-   }
-
-   public AtsAddPeerToPeerReviewRule(String name, String id) {
-      super(name, id);
-      setDescription("Work Page and Team Definition Option: PeerToPeer Review will be auto-created based on WorkData attribute values.");
-      setPeerToPeerParameterValue(this, PeerToPeerParameter.reviewBlockingType, "Commit");
-      setPeerToPeerParameterValue(this, PeerToPeerParameter.forState, "Implement");
-      setPeerToPeerParameterValue(this, PeerToPeerParameter.forEvent, StateEventType.CreateBranch.name());
-      try {
-         setPeerToPeerParameterValue(this, PeerToPeerParameter.assignees, "<99999997>");
-      } catch (Exception ex) {
-         OseeLog.log(AtsPlugin.class, Level.SEVERE, ex);
-      }
-   }
-
    public static void setPeerToPeerParameterValue(WorkRuleDefinition workRuleDefinition, PeerToPeerParameter decisionParameter, String value) {
       workRuleDefinition.addWorkDataKeyValue(decisionParameter.name(), value);
    }
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsAttributeReviewDefectXWidgetWorkItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsAttributeReviewDefectXWidgetWorkItem.java
deleted file mode 100644
index a6503a7..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsAttributeReviewDefectXWidgetWorkItem.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.item;
-
-import org.eclipse.osee.framework.core.data.IAttributeType;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.DynamicXWidgetLayoutData;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkWidgetDefinition;
-
-/**
- * @author Donald G. Dunne
- */
-public class AtsAttributeReviewDefectXWidgetWorkItem extends WorkWidgetDefinition {
-
-   protected AtsAttributeReviewDefectXWidgetWorkItem(IAttributeType attributeType) {
-      super(attributeType.getUnqualifiedName() + " - " + attributeType.getName(), attributeType.getName());
-      DynamicXWidgetLayoutData data = new DynamicXWidgetLayoutData(null);
-      data.setName(getName());
-      data.setStoreName(getId());
-      data.setXWidgetName("XDefectViewer");
-      set(data);
-   }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsAttributeReviewRolesXWidgetWorkItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsAttributeReviewRolesXWidgetWorkItem.java
deleted file mode 100644
index e628f5b..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsAttributeReviewRolesXWidgetWorkItem.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.item;
-
-import org.eclipse.osee.framework.core.data.IAttributeType;
-import org.eclipse.osee.framework.ui.skynet.widgets.XOption;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.DynamicXWidgetLayoutData;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkWidgetDefinition;
-
-/**
- * @author Donald G. Dunne
- */
-public class AtsAttributeReviewRolesXWidgetWorkItem extends WorkWidgetDefinition {
-   protected AtsAttributeReviewRolesXWidgetWorkItem(IAttributeType attributeType) {
-      super(attributeType.getUnqualifiedName() + " - " + attributeType.getName(), attributeType.getName());
-      DynamicXWidgetLayoutData data = new DynamicXWidgetLayoutData(null);
-      data.setName(getName());
-      data.setStoreName(getId());
-      data.getXOptionHandler().add(XOption.REQUIRED);
-      data.setXWidgetName("XUserRoleViewer");
-      set(data);
-   }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsAttributeSoleComboXWidgetWorkItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsAttributeSoleComboXWidgetWorkItem.java
deleted file mode 100644
index 4de1ecd..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsAttributeSoleComboXWidgetWorkItem.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.item;
-
-import org.eclipse.osee.framework.core.data.IAttributeType;
-import org.eclipse.osee.framework.ui.skynet.widgets.XOption;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.DynamicXWidgetLayoutData;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkWidgetDefinition;
-
-/**
- * @author Donald G. Dunne
- */
-public class AtsAttributeSoleComboXWidgetWorkItem extends WorkWidgetDefinition {
-   public AtsAttributeSoleComboXWidgetWorkItem(IAttributeType attributeType, String commaOptions, XOption... xOption) {
-      super(attributeType.getUnqualifiedName() + " - " + attributeType.getName(), attributeType.getName());
-      DynamicXWidgetLayoutData data = new DynamicXWidgetLayoutData(null);
-      data.setName(getName());
-      data.setStoreName(getId());
-      data.setXWidgetName("XComboDam(" + commaOptions + ")");
-      data.getXOptionHandler().add(xOption);
-      set(data);
-   }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsAttributeXWidgetWorkItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsAttributeXWidgetWorkItem.java
deleted file mode 100644
index 480baab..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsAttributeXWidgetWorkItem.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.item;
-
-import org.eclipse.osee.ats.artifact.ATSAttributes;
-import org.eclipse.osee.framework.core.data.IAttributeType;
-import org.eclipse.osee.framework.ui.skynet.widgets.XOption;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.DynamicXWidgetLayoutData;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkWidgetDefinition;
-
-/**
- * @author Donald G. Dunne
- */
-public class AtsAttributeXWidgetWorkItem extends WorkWidgetDefinition {
-
-   public AtsAttributeXWidgetWorkItem(String name, String id, String attributeTypeName, String xWidgetName, XOption... xOption) {
-      super(name + " - " + id, id);
-      DynamicXWidgetLayoutData data = new DynamicXWidgetLayoutData(null);
-      data.setName(name);
-      data.setId(id);
-      data.setStoreName(attributeTypeName);
-      data.setXWidgetName(xWidgetName);
-      data.getXOptionHandler().add(xOption);
-      set(data);
-   }
-
-   public AtsAttributeXWidgetWorkItem(ATSAttributes atsAttribute, String xWidgetName, XOption... xOption) {
-      this(atsAttribute.getDisplayName(), atsAttribute.getWorkItemId(), atsAttribute.getWorkItemId(), xWidgetName,
-         xOption);
-   }
-
-   public AtsAttributeXWidgetWorkItem(IAttributeType atsAttribute, String xWidgetName, XOption... xOption) {
-      this(atsAttribute.getUnqualifiedName(), atsAttribute.getName(), atsAttribute.getName(), xWidgetName, xOption);
-   }
-
-   public AtsAttributeXWidgetWorkItem(String name, String id, IAttributeType attributeType, String xWidgetName, XOption... xOption) {
-      this(name, id, attributeType.getName(), xWidgetName, xOption);
-   }
-
-   public AtsAttributeXWidgetWorkItem(String name, IAttributeType attributeType, String xWidgetName, XOption... xOption) {
-      this(name, attributeType.getName(), attributeType.getName(), xWidgetName, xOption);
-   }
-
-   public void setDefaultValue(String defaultValue) {
-      DynamicXWidgetLayoutData data = get();
-      data.setDefaultValue(defaultValue);
-      set(data);
-   }
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsCancellationReasonStateWorkItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsCancellationReasonStateWorkItem.java
deleted file mode 100644
index d701dd4..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsCancellationReasonStateWorkItem.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.item;
-
-import org.eclipse.osee.ats.artifact.AbstractWorkflowArtifact;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.ui.skynet.widgets.XOption;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.DynamicXWidgetLayoutData;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkWidgetDefinition;
-
-/**
- * @author Donald G. Dunne
- */
-public class AtsCancellationReasonStateWorkItem extends WorkWidgetDefinition {
-
-   public final static String ID = "ats.CancellationReason";
-
-   protected AtsCancellationReasonStateWorkItem(AbstractWorkflowArtifact sma) throws OseeCoreException {
-      super("Cancellation Reason", ID);
-      DynamicXWidgetLayoutData data = new DynamicXWidgetLayoutData(null);
-      data.setName(getName());
-      data.setDefaultValue(sma.getCancelledFromState());
-      data.setId(getId());
-      data.setXWidgetName("XText");
-      data.getXOptionHandler().add(XOption.NOT_EDITABLE);
-      data.getXOptionHandler().add(XOption.FILL_HORIZONTALLY);
-      setXWidgetLayoutData(data);
-   }
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsCancelledFromStateWorkItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsCancelledFromStateWorkItem.java
deleted file mode 100644
index f352fb5..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsCancelledFromStateWorkItem.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.item;
-
-import org.eclipse.osee.ats.artifact.AbstractWorkflowArtifact;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.ui.skynet.widgets.XOption;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.DynamicXWidgetLayoutData;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkWidgetDefinition;
-
-/**
- * @author Donald G. Dunne
- */
-public class AtsCancelledFromStateWorkItem extends WorkWidgetDefinition {
-
-   protected AtsCancelledFromStateWorkItem(AbstractWorkflowArtifact sma) throws OseeCoreException {
-      super("Cancelled from State", "ats.CancelledFromState");
-      DynamicXWidgetLayoutData data = new DynamicXWidgetLayoutData(null);
-      data.setName(getName());
-      data.setDefaultValue(sma.getCancelledFromState());
-      data.setId(getId());
-      data.setXWidgetName("XText");
-      data.getXOptionHandler().add(XOption.NOT_EDITABLE);
-      data.getXOptionHandler().add(XOption.FILL_HORIZONTALLY);
-      setXWidgetLayoutData(data);
-   }
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsCompletedFromStateWorkItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsCompletedFromStateWorkItem.java
deleted file mode 100644
index 30aeb8d..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsCompletedFromStateWorkItem.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.item;
-
-import org.eclipse.osee.ats.artifact.AbstractWorkflowArtifact;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.ui.skynet.widgets.XOption;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.DynamicXWidgetLayoutData;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkWidgetDefinition;
-
-/**
- * @author Donald G. Dunne
- */
-public class AtsCompletedFromStateWorkItem extends WorkWidgetDefinition {
-
-   protected AtsCompletedFromStateWorkItem(AbstractWorkflowArtifact sma) throws OseeCoreException {
-      super("Completed from State", "ats.CompletedFromState");
-      DynamicXWidgetLayoutData data = new DynamicXWidgetLayoutData(null);
-      data.setName(getName());
-      data.setDefaultValue(sma.getCompletedFromState());
-      data.setId(getId());
-      data.setXWidgetName("XText");
-      data.getXOptionHandler().add(XOption.NOT_EDITABLE);
-      data.getXOptionHandler().add(XOption.FILL_HORIZONTALLY);
-      setXWidgetLayoutData(data);
-   }
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsStatePercentCompleteWeightDecisionReviewRule.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsStatePercentCompleteWeightDecisionReviewRule.java
deleted file mode 100644
index a446cef..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsStatePercentCompleteWeightDecisionReviewRule.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.item;
-
-import org.eclipse.osee.ats.artifact.DecisionReviewState;
-
-/**
- * @author Donald G. Dunne
- */
-public class AtsStatePercentCompleteWeightDecisionReviewRule extends AtsStatePercentCompleteWeightRule {
-
-   public final static String ID = "atsStatePercentCompleteWeight.DecisionReview";
-
-   public AtsStatePercentCompleteWeightDecisionReviewRule() {
-      super(ID, ID);
-      setDescription("State Percent Complete rule for Decision Review.");
-      addWorkDataKeyValue(DecisionReviewState.Prepare.getPageName(), ".20");
-      addWorkDataKeyValue(DecisionReviewState.Decision.getPageName(), ".69");
-      addWorkDataKeyValue(DecisionReviewState.Followup.getPageName(), ".09");
-      addWorkDataKeyValue(DecisionReviewState.Completed.getPageName(), ".01");
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsStatePercentCompleteWeightDefaultWorkflowRule.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsStatePercentCompleteWeightDefaultWorkflowRule.java
deleted file mode 100644
index f007592..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsStatePercentCompleteWeightDefaultWorkflowRule.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.item;
-
-import org.eclipse.osee.ats.util.TeamState;
-
-/**
- * @author Donald G. Dunne
- */
-public class AtsStatePercentCompleteWeightDefaultWorkflowRule extends AtsStatePercentCompleteWeightRule {
-
-   public final static String ID = "atsStatePercentCompleteWeight.DefaultWorkflow";
-
-   public AtsStatePercentCompleteWeightDefaultWorkflowRule() {
-      super(ID, ID);
-      setDescription("State Percent Complete rule where Analyze and Implement states are where work is performed.");
-      addWorkDataKeyValue(TeamState.Endorse.getPageName(), ".05");
-      addWorkDataKeyValue(TeamState.Analyze.getPageName(), ".1");
-      addWorkDataKeyValue(TeamState.Authorize.getPageName(), ".05");
-      addWorkDataKeyValue(TeamState.Implement.getPageName(), ".79");
-      addWorkDataKeyValue(TeamState.Completed.getPageName(), ".01");
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsStatePercentCompleteWeightPeerToPeerReviewRule.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsStatePercentCompleteWeightPeerToPeerReviewRule.java
deleted file mode 100644
index 5924a9f..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsStatePercentCompleteWeightPeerToPeerReviewRule.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.item;
-
-import org.eclipse.osee.ats.artifact.PeerToPeerReviewState;
-
-/**
- * @author Donald G. Dunne
- */
-public class AtsStatePercentCompleteWeightPeerToPeerReviewRule extends AtsStatePercentCompleteWeightRule {
-
-   public final static String ID = "atsStatePercentCompleteWeight.PeerToPeerReview";
-
-   public AtsStatePercentCompleteWeightPeerToPeerReviewRule() {
-      super(ID, ID);
-      setDescription("State Percent Complete rule for PeerToPeer Review.");
-      addWorkDataKeyValue(PeerToPeerReviewState.Prepare.getPageName(), ".20");
-      addWorkDataKeyValue(PeerToPeerReviewState.Review.getPageName(), ".79");
-      addWorkDataKeyValue(PeerToPeerReviewState.Completed.getPageName(), ".01");
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsStatePercentCompleteWeightRule.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsStatePercentCompleteWeightRule.java
deleted file mode 100644
index 9a3fdda..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsStatePercentCompleteWeightRule.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.item;
-
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkRuleDefinition;
-
-/**
- * @author Donald G. Dunne
- */
-public class AtsStatePercentCompleteWeightRule extends WorkRuleDefinition {
-
-   public final static String ID = "atsStatePercentCompleteWeight";
-
-   public AtsStatePercentCompleteWeightRule() {
-      this(ID, ID);
-   }
-
-   public AtsStatePercentCompleteWeightRule(String name, String id) {
-      super(name, id);
-      setDescription("Work Flow Option: <state>=<percent> Work Data attributes specify weighting given to each state in percent complete calculations.  <state> is either state name (not id) and <percent> is number from 0..1");
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsStatePercentCompleteWeightSimpleWorkflowRule.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsStatePercentCompleteWeightSimpleWorkflowRule.java
deleted file mode 100644
index 7ad878a..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsStatePercentCompleteWeightSimpleWorkflowRule.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.item;
-
-import org.eclipse.osee.ats.workflow.flow.SimpleWorkflowDefinition.SimpleState;
-
-/**
- * @author Donald G. Dunne
- */
-public class AtsStatePercentCompleteWeightSimpleWorkflowRule extends AtsStatePercentCompleteWeightRule {
-
-   public final static String ID = "atsStatePercentCompleteWeight.SimpleWorkflow";
-
-   public AtsStatePercentCompleteWeightSimpleWorkflowRule() {
-      super(ID, ID);
-      setDescription("State Percent Complete rule where InWork work is performed.");
-      addWorkDataKeyValue(SimpleState.Endorse.name(), ".10");
-      addWorkDataKeyValue(SimpleState.InWork.name(), ".89");
-      addWorkDataKeyValue(SimpleState.Completed.name(), ".01");
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsWorkDefinitions.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsWorkDefinitions.java
index e7e98d2..e1f07cb 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsWorkDefinitions.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsWorkDefinitions.java
@@ -10,55 +10,27 @@
  *******************************************************************************/
 package org.eclipse.osee.ats.workflow.item;
 
-import static org.eclipse.osee.framework.ui.skynet.widgets.XOption.FILL_VERTICALLY;
-import static org.eclipse.osee.framework.ui.skynet.widgets.XOption.HORIZONTAL_LABEL;
-import static org.eclipse.osee.framework.ui.skynet.widgets.XOption.NONE;
-import static org.eclipse.osee.framework.ui.skynet.widgets.XOption.REQUIRED;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
-import java.util.List;
 import org.eclipse.osee.ats.actions.wizard.ITeamWorkflowProvider;
 import org.eclipse.osee.ats.artifact.ATSAttributes;
 import org.eclipse.osee.ats.artifact.AbstractWorkflowArtifact;
-import org.eclipse.osee.ats.artifact.AtsArtifactToken;
 import org.eclipse.osee.ats.artifact.AtsAttributeTypes;
 import org.eclipse.osee.ats.artifact.DecisionReviewArtifact;
-import org.eclipse.osee.ats.artifact.GoalArtifact;
 import org.eclipse.osee.ats.artifact.PeerToPeerReviewArtifact;
 import org.eclipse.osee.ats.artifact.TaskArtifact;
 import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.artifact.TeamWorkflowProviders;
-import org.eclipse.osee.ats.column.ChangeTypeXWidget;
-import org.eclipse.osee.ats.column.EstimatedHoursRequiredXWidget;
-import org.eclipse.osee.ats.column.EstimatedHoursXWidget;
-import org.eclipse.osee.ats.column.OperationalImpactWithWorkaroundXWidget.XOperationalImpactWithWorkaroundRequiredXWidgetWorkItem;
-import org.eclipse.osee.ats.column.OperationalImpactWithWorkaroundXWidget.XOperationalImpactWithWorkaroundXWidgetWorkItem;
-import org.eclipse.osee.ats.column.OperationalImpactXWidget.XOperationalImpactRequiredXWidgetWorkItem;
-import org.eclipse.osee.ats.column.OperationalImpactXWidget.XOperationalImpactXWidgetWorkItem;
-import org.eclipse.osee.ats.column.PriorityXWidget;
 import org.eclipse.osee.ats.util.AtsArtifactTypes;
-import org.eclipse.osee.ats.util.AtsUtil;
 import org.eclipse.osee.ats.util.widgets.XWorkingBranch;
 import org.eclipse.osee.ats.util.widgets.commit.XCommitManager;
 import org.eclipse.osee.ats.workdef.RuleDefinitionOption;
 import org.eclipse.osee.ats.workdef.StateDefinition;
-import org.eclipse.osee.ats.workflow.flow.DecisionWorkflowDefinition;
-import org.eclipse.osee.ats.workflow.flow.GoalWorkflowDefinition;
-import org.eclipse.osee.ats.workflow.flow.PeerToPeerWorkflowDefinition;
-import org.eclipse.osee.ats.workflow.flow.TaskWorkflowDefinition;
-import org.eclipse.osee.ats.workflow.page.AtsDecisionDecisionWorkPageDefinition;
-import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
-import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
-import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.core.exception.OseeStateException;
 import org.eclipse.osee.framework.jdk.core.util.Strings;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
 import org.eclipse.osee.framework.ui.plugin.util.Result;
-import org.eclipse.osee.framework.ui.skynet.results.XResultData;
-import org.eclipse.osee.framework.ui.skynet.widgets.XOption;
 import org.eclipse.osee.framework.ui.skynet.widgets.XWidget;
 import org.eclipse.osee.framework.ui.skynet.widgets.workflow.DynamicXWidgetLayoutData;
 import org.eclipse.osee.framework.ui.skynet.widgets.workflow.FrameworkXWidgetProvider;
@@ -66,10 +38,8 @@
 import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkFlowDefinition;
 import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkFlowDefinitionMatch;
 import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinition;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinition.WriteType;
 import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinitionFactory;
 import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinition;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkRuleDefinition;
 import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkWidgetDefinition;
 
 /**
@@ -82,6 +52,12 @@
 
    public static final String ATS_DESCRIPTION_NOT_REQUIRED_ID = AtsAttributeTypes.Description + ".notRequired";
    public static final String ATS_ESTIMATED_HOURS_NOT_REQUIRED_ID = AtsAttributeTypes.EstimatedHours + ".notRequired";
+   public static final String TaskWorkflowDefinitionId = "osee.ats.taskWorkflow";
+   public static final String GoalWorkflowDefinitionId = "osee.ats.goalWorkflow";
+   public static final String PeerToPeerWorkflowDefinitionId = "osee.ats.peerToPeerReview";
+   public static final String DecisionWorkflowDefinitionId = "osee.ats.decisionReview";
+   public final static String DECISION_QUESTION_LABEL = "ats.Decision Question";
+   public final static String DECISION_ANSWER_LABEL = "ats.Decision Answer";
 
    public static enum RuleWorkItemId {
       atsRequireStateHourSpentPrompt("Work Page Option: Will popup a dialog to prompt user for time spent in this state."),
@@ -112,106 +88,6 @@
       WorkItemDefinitionFactory.relateWorkItemDefinitions(pageId, XCommitManager.WIDGET_ID);
    }
 
-   public static List<WorkItemDefinition> getAtsWorkDefinitions() {
-      List<WorkItemDefinition> workItems = new ArrayList<WorkItemDefinition>();
-
-      getWorkItemRules(workItems);
-
-      // Create XWidget work items
-      workItems.add(new AtsAttributeXWidgetWorkItem(AtsAttributeTypes.LocChanged, "XIntegerDam",
-         XOption.BEGIN_COMPOSITE_8));
-      workItems.add(new AtsAttributeXWidgetWorkItem(AtsAttributeTypes.LocReviewed, "XIntegerDam"));
-      workItems.add(new AtsAttributeXWidgetWorkItem(AtsAttributeTypes.PagesChanged, "XIntegerDam"));
-      workItems.add(new AtsAttributeXWidgetWorkItem(AtsAttributeTypes.PagesReviewed, "XIntegerDam",
-         XOption.END_COMPOSITE));
-      workItems.add(new AtsAttributeXWidgetWorkItem(AtsAttributeTypes.Location, "XTextDam", XOption.REQUIRED,
-         FILL_VERTICALLY));
-      workItems.add(new AtsAttributeXWidgetWorkItem(AtsAttributeTypes.LegacyPcrId, "XTextDam"));
-      workItems.add(new AtsAttributeXWidgetWorkItem(AtsAttributeTypes.GoalOrderVote, "XTextDam"));
-      workItems.add(new AtsAttributeXWidgetWorkItem(AtsAttributeTypes.Category1, "XTextDam"));
-      workItems.add(new AtsAttributeXWidgetWorkItem(AtsAttributeTypes.RelatedToState, "XTextDam"));
-      workItems.add(new AtsAttributeXWidgetWorkItem(AtsAttributeTypes.SmaNote, "XTextDam", FILL_VERTICALLY));
-      workItems.add(new AtsAttributeXWidgetWorkItem("Title", "ats.Title", CoreAttributeTypes.Name, "XTextDam", REQUIRED));
-      workItems.add(new AtsAttributeXWidgetWorkItem(AtsAttributeTypes.Resolution, "XTextDam", FILL_VERTICALLY));
-      workItems.add(new AtsAttributeXWidgetWorkItem(AtsAttributeTypes.DecisionReviewOptions, "XTextDam",
-         FILL_VERTICALLY));
-      workItems.add(new AtsAttributeXWidgetWorkItem(AtsAttributeTypes.Problem, "XTextDam", FILL_VERTICALLY));
-      workItems.add(new AtsAttributeXWidgetWorkItem(AtsAttributeTypes.WorkPackage, "XTextDam", HORIZONTAL_LABEL));
-      workItems.add(new AtsAttributeXWidgetWorkItem(ATSAttributes.WORKING_BRANCH_WIDGET, "XWorkingBranch", NONE));
-      workItems.add(new XOperationalImpactXWidgetWorkItem());
-      workItems.add(new XOperationalImpactRequiredXWidgetWorkItem());
-      workItems.add(new XOperationalImpactWithWorkaroundXWidgetWorkItem());
-      workItems.add(new XOperationalImpactWithWorkaroundRequiredXWidgetWorkItem());
-      workItems.add(new AtsAttributeXWidgetWorkItem(ATSAttributes.VALIDATE_REQ_CHANGES_WIDGET,
-         "XValidateReqChangesButton", NONE));
-      workItems.add(new AtsAttributeXWidgetWorkItem(ATSAttributes.CREATE_CODE_TEST_TASKS_OFF_REQUIREMENTS,
-         "XCreateCodeTestTasksButton", NONE));
-      workItems.add(new AtsAttributeXWidgetWorkItem(ATSAttributes.CHECK_SIGNALS_VIA_CDB_WIDGET,
-         "XCheckSiganlsViaCDBButton", NONE));
-      workItems.add(new AtsAttributeXWidgetWorkItem(ATSAttributes.SHOW_CDB_DIFF_REPORT_WIDGET,
-         "XShowCdbDiffReportButton", NONE));
-
-      workItems.add(new AtsAttributeXWidgetWorkItem("Question",
-         AtsDecisionDecisionWorkPageDefinition.DECISION_QUESTION_LABEL, CoreAttributeTypes.Name, "XLabelDam"));
-
-      workItems.add(new AtsAttributeXWidgetWorkItem("Decision",
-         AtsDecisionDecisionWorkPageDefinition.DECISION_ANSWER_LABEL, AtsAttributeTypes.Decision, "XLabelDam"));
-
-      workItems.add(new AtsAttributeXWidgetWorkItem(AtsAttributeTypes.ProposedResolution, "XTextDam", FILL_VERTICALLY));
-      workItems.add(new AtsAttributeXWidgetWorkItem(AtsAttributeTypes.Description, "XTextDam", XOption.REQUIRED,
-         FILL_VERTICALLY));
-      workItems.add(new AtsAttributeXWidgetWorkItem(AtsAttributeTypes.Description.getUnqualifiedName(),
-         ATS_DESCRIPTION_NOT_REQUIRED_ID, AtsAttributeTypes.Description, "XTextDam", XOption.NOT_REQUIRED,
-         FILL_VERTICALLY));
-
-      workItems.add(new AtsAttributeXWidgetWorkItem(AtsAttributeTypes.ReviewBlocks,
-         "XComboDam(OPTIONS_FROM_ATTRIBUTE_VALIDITY)", XOption.REQUIRED, XOption.HORIZONTAL_LABEL));
-      workItems.add(new AtsAttributeXWidgetWorkItem(AtsAttributeTypes.Decision, "XComboDam(1,2,3)", REQUIRED,
-         HORIZONTAL_LABEL));
-
-      workItems.add(new EstimatedHoursRequiredXWidget());
-      workItems.add(new EstimatedHoursXWidget());
-
-      workItems.add(new AtsAttributeXWidgetWorkItem(AtsAttributeTypes.EstimatedCompletionDate, "XDateDam",
-         XOption.HORIZONTAL_LABEL));
-      workItems.add(new ChangeTypeXWidget());
-      workItems.add(new PriorityXWidget());
-
-      workItems.add(new AtsAttributeXWidgetWorkItem(AtsAttributeTypes.NeedBy, "XDateDam", XOption.HORIZONTAL_LABEL,
-         XOption.END_COMPOSITE));
-      workItems.add(new AtsAttributeXWidgetWorkItem(AtsAttributeTypes.ValidationRequired, "XCheckBoxDam",
-         XOption.HORIZONTAL_LABEL, XOption.LABEL_BEFORE));
-      workItems.add(new AtsAttributeXWidgetWorkItem(AtsAttributeTypes.UserCommunity,
-         "XListDam(OPTIONS_FROM_ATTRIBUTE_VALIDITY)", XOption.HORIZONTAL_LABEL));
-      workItems.add(new AtsAttributeXWidgetWorkItem(ATSAttributes.COMMIT_MANAGER_WIDGET, "XCommitManager"));
-      workItems.add(new AtsAttributeReviewDefectXWidgetWorkItem(AtsAttributeTypes.ReviewDefect));
-      workItems.add(new AtsAttributeReviewRolesXWidgetWorkItem(AtsAttributeTypes.Role));
-
-      return workItems;
-   }
-
-   private static void getWorkItemRules(List<WorkItemDefinition> workItems) {
-      // Create rule work items
-      workItems.add(new WorkRuleDefinition(RuleWorkItemId.atsRequireStateHourSpentPrompt.name()));
-      workItems.add(new WorkRuleDefinition(RuleWorkItemId.atsAddDecisionValidateBlockingReview.name()));
-      workItems.add(new WorkRuleDefinition(RuleWorkItemId.atsAddDecisionValidateNonBlockingReview.name()));
-      workItems.add(new WorkRuleDefinition(RuleWorkItemId.atsAllowTransitionWithWorkingBranch.name()));
-      workItems.add(new WorkRuleDefinition(RuleWorkItemId.atsForceAssigneesToTeamLeads.name()));
-      workItems.add(new WorkRuleDefinition(RuleWorkItemId.atsRequireTargetedVersion.name()));
-      workItems.add(new WorkRuleDefinition(RuleWorkItemId.atsAllowPriviledgedEditToTeamMember.name()));
-      workItems.add(new WorkRuleDefinition(RuleWorkItemId.atsAllowPriviledgedEditToTeamMemberAndOriginator.name()));
-      workItems.add(new WorkRuleDefinition(RuleWorkItemId.atsAllowPriviledgedEditToAll.name()));
-      workItems.add(new WorkRuleDefinition(RuleWorkItemId.atsAllowEditToAll.name()));
-      workItems.add(new WorkRuleDefinition(RuleWorkItemId.atsAllowAssigneeToAll.name()));
-      workItems.add(new AtsAddDecisionReviewRule());
-      workItems.add(new AtsAddPeerToPeerReviewRule());
-      workItems.add(new AtsStatePercentCompleteWeightRule());
-      workItems.add(new AtsStatePercentCompleteWeightDefaultWorkflowRule());
-      workItems.add(new AtsStatePercentCompleteWeightSimpleWorkflowRule());
-      workItems.add(new AtsStatePercentCompleteWeightDecisionReviewRule());
-      workItems.add(new AtsStatePercentCompleteWeightPeerToPeerReviewRule());
-   }
-
    @Override
    public Collection<WorkItemDefinition> getProgramaticWorkItemDefinitions() {
       return new ArrayList<WorkItemDefinition>();
@@ -261,10 +137,10 @@
       if (!match.isMatched()) {
          // Else, use default Task workflow
          WorkFlowDefinition workDef =
-            (WorkFlowDefinition) WorkItemDefinitionFactory.getWorkItemDefinition(TaskWorkflowDefinition.ID);
+            (WorkFlowDefinition) WorkItemDefinitionFactory.getWorkItemDefinition(TaskWorkflowDefinitionId);
          if (workDef != null) {
             return new WorkFlowDefinitionMatch(workDef, String.format("default TaskWorkflowDefinition ID [%s]",
-               TaskWorkflowDefinition.ID));
+               TaskWorkflowDefinitionId));
          }
       }
       return match;
@@ -302,22 +178,22 @@
          }
          if (artifact.isOfType(AtsArtifactTypes.Goal)) {
             WorkFlowDefinition workDef =
-               (WorkFlowDefinition) WorkItemDefinitionFactory.getWorkItemDefinition(GoalWorkflowDefinition.ID);
+               (WorkFlowDefinition) WorkItemDefinitionFactory.getWorkItemDefinition(GoalWorkflowDefinitionId);
             return new WorkFlowDefinitionMatch(workDef, (String.format("default GoalWorkflowDefinition ID [%s]",
-               GoalWorkflowDefinition.ID)));
+               GoalWorkflowDefinitionId)));
 
          }
          if (artifact instanceof PeerToPeerReviewArtifact) {
             WorkFlowDefinition workDef =
-               (WorkFlowDefinition) WorkItemDefinitionFactory.getWorkItemDefinition(PeerToPeerWorkflowDefinition.ID);
+               (WorkFlowDefinition) WorkItemDefinitionFactory.getWorkItemDefinition(PeerToPeerWorkflowDefinitionId);
             return new WorkFlowDefinitionMatch(workDef, (String.format("default PeerToPeerWorkflowDefinition ID [%s]",
-               PeerToPeerWorkflowDefinition.ID)));
+               PeerToPeerWorkflowDefinitionId)));
          }
          if (artifact instanceof DecisionReviewArtifact) {
             WorkFlowDefinition workDef =
-               (WorkFlowDefinition) WorkItemDefinitionFactory.getWorkItemDefinition(DecisionWorkflowDefinition.ID);
+               (WorkFlowDefinition) WorkItemDefinitionFactory.getWorkItemDefinition(DecisionWorkflowDefinitionId);
             return new WorkFlowDefinitionMatch(workDef, (String.format("default DecisionWorkflowDefinition ID [%s]",
-               DecisionWorkflowDefinition.ID)));
+               DecisionWorkflowDefinitionId)));
          }
       }
       return null;
@@ -357,60 +233,6 @@
       return stateDefinition.hasRule(ATSAttributes.COMMIT_MANAGER_WIDGET.getWorkItemId());
    }
 
-   public static void importWorkItemDefinitionsIntoDb(WriteType writeType, XResultData resultData, WorkItemDefinition workItemDefinition) throws OseeCoreException {
-      importWorkItemDefinitionsIntoDb(writeType, resultData,
-         Arrays.asList(new WorkItemDefinition[] {workItemDefinition}));
-   }
-
-   public static void importWorkItemDefinitionsIntoDb(final WriteType writeType, final XResultData resultData, final Collection<? extends WorkItemDefinition> workItemDefinitions) throws OseeCoreException {
-
-      SkynetTransaction transaction = new SkynetTransaction(AtsUtil.getAtsBranch(), "Import ATS Work Item Definitions");
-      // Items must be imported in order due to the relations that are created between items
-      for (Class<?> clazz : new Class[] {
-         WorkRuleDefinition.class,
-         WorkWidgetDefinition.class,
-         WorkPageDefinition.class,
-         WorkFlowDefinition.class}) {
-         for (WorkItemDefinition wid : workItemDefinitions) {
-            if (clazz.isInstance(wid)) {
-               // System.out.println("Adding " + wid.getId() + " as class " + clazz);
-               Artifact art = wid.toArtifact(writeType);
-               addUpdateWorkItemToDefaultHeirarchy(art, transaction);
-               if (art.isDirty() && resultData != null) {
-                  resultData.log("Updated [" + art.getArtifactTypeName() + "][" + art + "]");
-               }
-               art.persist(transaction);
-            }
-         }
-      }
-      transaction.execute();
-   }
-
-   public static void addUpdateWorkItemToDefaultHeirarchy(Artifact art, SkynetTransaction transaction) throws OseeCoreException {
-      // Relate if not already related
-      if (art.getRelatedArtifacts(CoreRelationTypes.WorkItem__Parent, Artifact.class).isEmpty()) {
-         if (art.isOfType(CoreArtifactTypes.WorkPageDefinition)) {
-            relateIfNotRelated(AtsUtil.getFromToken(AtsArtifactToken.WorkPagesFolder), art, transaction);
-         }
-         if (art.isOfType(CoreArtifactTypes.WorkRuleDefinition)) {
-            relateIfNotRelated(AtsUtil.getFromToken(AtsArtifactToken.WorkRulesFolder), art, transaction);
-         }
-         if (art.isOfType(CoreArtifactTypes.WorkWidgetDefinition)) {
-            relateIfNotRelated(AtsUtil.getFromToken(AtsArtifactToken.WorkWidgetsFolder), art, transaction);
-         }
-         if (art.isOfType(CoreArtifactTypes.WorkFlowDefinition)) {
-            relateIfNotRelated(AtsUtil.getFromToken(AtsArtifactToken.WorkFlowsFolder), art, transaction);
-         }
-      }
-   }
-
-   private static void relateIfNotRelated(Artifact parent, Artifact child, SkynetTransaction transaction) throws OseeCoreException {
-      if (!parent.getChildren().contains(child) && !child.hasParent()) {
-         parent.addChild(child);
-         parent.persist(transaction);
-      }
-   }
-
    public static Result validateWorkItemDefinition(WorkItemDefinition workItemDefinition) {
       try {
          if (workItemDefinition instanceof WorkPageDefinition) {
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/SimpleXWidgetWorkItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/SimpleXWidgetWorkItem.java
deleted file mode 100644
index a14dca3..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/SimpleXWidgetWorkItem.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.item;
-
-import org.eclipse.osee.framework.ui.skynet.widgets.XOption;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.DynamicXWidgetLayoutData;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkWidgetDefinition;
-
-/**
- * @author Donald G. Dunne
- */
-public class SimpleXWidgetWorkItem extends WorkWidgetDefinition {
-
-   public SimpleXWidgetWorkItem(String name, String id, String xWidgetName, XOption... xOption) {
-      super(name + " - " + id, id);
-      DynamicXWidgetLayoutData data = new DynamicXWidgetLayoutData(null);
-      data.setName(name);
-      data.setId(id);
-      data.setXWidgetName(xWidgetName);
-      data.getXOptionHandler().add(xOption);
-      set(data);
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/page/AtsAnalyzeWorkPageDefinition.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/page/AtsAnalyzeWorkPageDefinition.java
deleted file mode 100644
index c2988e0..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/page/AtsAnalyzeWorkPageDefinition.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.page;
-
-import org.eclipse.osee.ats.artifact.AtsAttributeTypes;
-import org.eclipse.osee.ats.util.TeamState;
-import org.eclipse.osee.ats.workflow.flow.TeamWorkflowDefinition;
-import org.eclipse.osee.ats.workflow.item.AtsWorkDefinitions.RuleWorkItemId;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinition;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageType;
-
-/**
- * @author Donald G. Dunne
- */
-public class AtsAnalyzeWorkPageDefinition extends WorkPageDefinition {
-
-   public final static String ID = TeamWorkflowDefinition.ID + "." + TeamState.Analyze.getPageName();
-
-   public AtsAnalyzeWorkPageDefinition(int ordinal) {
-      this(TeamState.Analyze.getPageName(), ID, null, ordinal);
-   }
-
-   public AtsAnalyzeWorkPageDefinition(String name, String pageId, String parentId, int ordinal) {
-      super(name, pageId, parentId, WorkPageType.Working, ordinal);
-      addWorkItem(RuleWorkItemId.atsRequireStateHourSpentPrompt.name());
-      addWorkItem(AtsAttributeTypes.WorkPackage);
-      addWorkItem(AtsAttributeTypes.Problem);
-      addWorkItem(AtsAttributeTypes.ProposedResolution);
-      addWorkItem(AtsAttributeTypes.ChangeType);
-      addWorkItem(AtsAttributeTypes.PriorityType);
-      addWorkItem(AtsAttributeTypes.NeedBy);
-      addWorkItem(AtsAttributeTypes.EstimatedHours);
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/page/AtsAuthorizeWorkPageDefinition.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/page/AtsAuthorizeWorkPageDefinition.java
deleted file mode 100644
index a25bb81..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/page/AtsAuthorizeWorkPageDefinition.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.page;
-
-import org.eclipse.osee.ats.artifact.AtsAttributeTypes;
-import org.eclipse.osee.ats.util.TeamState;
-import org.eclipse.osee.ats.workflow.flow.TeamWorkflowDefinition;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinition;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageType;
-
-/**
- * @author Donald G. Dunne
- */
-public class AtsAuthorizeWorkPageDefinition extends WorkPageDefinition {
-
-   public final static String ID = TeamWorkflowDefinition.ID + "." + TeamState.Authorize.getPageName();
-
-   public AtsAuthorizeWorkPageDefinition(int ordinal) {
-      this(TeamState.Authorize.getPageName(), ID, null, ordinal);
-   }
-
-   public AtsAuthorizeWorkPageDefinition(String name, String pageId, String parentId, int ordinal) {
-      super(name, pageId, parentId, WorkPageType.Working, ordinal);
-      addWorkItem(AtsAttributeTypes.WorkPackage);
-      addWorkItem(AtsAttributeTypes.EstimatedCompletionDate);
-   }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/page/AtsCancelledWorkPageDefinition.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/page/AtsCancelledWorkPageDefinition.java
deleted file mode 100644
index 9edee34..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/page/AtsCancelledWorkPageDefinition.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.page;
-
-import org.eclipse.osee.ats.util.TeamState;
-import org.eclipse.osee.ats.workflow.flow.TeamWorkflowDefinition;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinition;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageType;
-
-/**
- * @author Donald G. Dunne
- */
-public class AtsCancelledWorkPageDefinition extends WorkPageDefinition {
-
-   public final static String ID = TeamWorkflowDefinition.ID + "." + TeamState.Cancelled.getPageName();
-
-   public AtsCancelledWorkPageDefinition(int ordinal) {
-      this(TeamState.Cancelled.getPageName(), ID, null, ordinal);
-   }
-
-   public AtsCancelledWorkPageDefinition(String name, String pageId, String parentId, int ordinal) {
-      super(name, pageId, parentId, WorkPageType.Cancelled, ordinal);
-   }
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/page/AtsCompletedWorkPageDefinition.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/page/AtsCompletedWorkPageDefinition.java
deleted file mode 100644
index a4f0aef..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/page/AtsCompletedWorkPageDefinition.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.page;
-
-import org.eclipse.osee.ats.util.TeamState;
-import org.eclipse.osee.ats.workflow.flow.TeamWorkflowDefinition;
-import org.eclipse.osee.ats.workflow.item.AtsWorkDefinitions.RuleWorkItemId;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinition;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageType;
-
-/**
- * @author Donald G. Dunne
- */
-public class AtsCompletedWorkPageDefinition extends WorkPageDefinition {
-
-   public final static String ID = TeamWorkflowDefinition.ID + "." + TeamState.Completed.getPageName();
-
-   public AtsCompletedWorkPageDefinition(int ordinal) {
-      this(TeamState.Completed.getPageName(), ID, null, ordinal);
-   }
-
-   public AtsCompletedWorkPageDefinition(String name, String pageId, String parentId, int ordinal) {
-      super(name, pageId, parentId, WorkPageType.Completed, ordinal);
-      addWorkItem(RuleWorkItemId.atsAddDecisionValidateBlockingReview.name());
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/page/AtsDecisionCompletedWorkPageDefinition.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/page/AtsDecisionCompletedWorkPageDefinition.java
deleted file mode 100644
index 31366ab..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/page/AtsDecisionCompletedWorkPageDefinition.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.page;
-
-import org.eclipse.osee.ats.artifact.AtsAttributeTypes;
-import org.eclipse.osee.ats.util.TeamState;
-import org.eclipse.osee.ats.workflow.flow.DecisionWorkflowDefinition;
-import org.eclipse.osee.ats.workflow.item.AtsWorkDefinitions.RuleWorkItemId;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinition;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageType;
-
-/**
- * @author Donald G. Dunne
- */
-public class AtsDecisionCompletedWorkPageDefinition extends WorkPageDefinition {
-
-   public final static String ID = DecisionWorkflowDefinition.ID + "." + TeamState.Completed.getPageName();
-
-   public AtsDecisionCompletedWorkPageDefinition(int ordinal) {
-      this(TeamState.Completed.getPageName(), ID, null, ordinal);
-   }
-
-   public AtsDecisionCompletedWorkPageDefinition(String name, String pageId, String parentId, int ordinal) {
-      super(name, pageId, parentId, WorkPageType.Completed, ordinal);
-      addWorkItem(RuleWorkItemId.atsAddDecisionValidateBlockingReview.name());
-      addWorkItem(AtsDecisionDecisionWorkPageDefinition.DECISION_QUESTION_LABEL);
-      addWorkItem(AtsDecisionDecisionWorkPageDefinition.DECISION_ANSWER_LABEL);
-      addWorkItem(AtsAttributeTypes.Resolution);
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/page/AtsDecisionDecisionWorkPageDefinition.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/page/AtsDecisionDecisionWorkPageDefinition.java
deleted file mode 100644
index 64dedfb..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/page/AtsDecisionDecisionWorkPageDefinition.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.page;
-
-import org.eclipse.osee.ats.artifact.AtsAttributeTypes;
-import org.eclipse.osee.ats.artifact.DecisionReviewState;
-import org.eclipse.osee.ats.workflow.flow.DecisionWorkflowDefinition;
-import org.eclipse.osee.ats.workflow.item.AtsWorkDefinitions;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinition;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageType;
-
-/**
- * @author Donald G. Dunne
- */
-public class AtsDecisionDecisionWorkPageDefinition extends WorkPageDefinition {
-
-   public final static String ID = DecisionWorkflowDefinition.ID + "." + DecisionReviewState.Decision.getPageName();
-   public final static String DECISION_QUESTION_LABEL = "ats.Decision Question";
-   public final static String DECISION_ANSWER_LABEL = "ats.Decision Answer";
-
-   public AtsDecisionDecisionWorkPageDefinition(int ordinal) {
-      this(DecisionReviewState.Decision.getPageName(), ID, null, ordinal);
-   }
-
-   public AtsDecisionDecisionWorkPageDefinition(String name, String pageId, String parentId, int ordinal) {
-      super(name, pageId, parentId, WorkPageType.Working, ordinal);
-      addWorkItem(AtsDecisionDecisionWorkPageDefinition.DECISION_QUESTION_LABEL);
-      addWorkItem(AtsAttributeTypes.Decision);
-      addWorkItem(AtsWorkDefinitions.ATS_DESCRIPTION_NOT_REQUIRED_ID);
-      addWorkItem(AtsAttributeTypes.Resolution);
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/page/AtsDecisionFollowupWorkPageDefinition.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/page/AtsDecisionFollowupWorkPageDefinition.java
deleted file mode 100644
index 4bd07ad..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/page/AtsDecisionFollowupWorkPageDefinition.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.page;
-
-import org.eclipse.osee.ats.artifact.AtsAttributeTypes;
-import org.eclipse.osee.ats.artifact.DecisionReviewState;
-import org.eclipse.osee.ats.workflow.flow.DecisionWorkflowDefinition;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinition;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageType;
-
-/**
- * @author Donald G. Dunne
- */
-public class AtsDecisionFollowupWorkPageDefinition extends WorkPageDefinition {
-
-   public final static String ID = DecisionWorkflowDefinition.ID + "." + DecisionReviewState.Followup.getPageName();
-
-   public AtsDecisionFollowupWorkPageDefinition(int ordinal) {
-      this(DecisionReviewState.Followup.getPageName(), ID, null, ordinal);
-   }
-
-   public AtsDecisionFollowupWorkPageDefinition(String name, String pageId, String parentId, int ordinal) {
-      super(name, pageId, parentId, WorkPageType.Working, ordinal);
-      addWorkItem(AtsAttributeTypes.Resolution);
-   }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/page/AtsDecisionPrepareWorkPageDefinition.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/page/AtsDecisionPrepareWorkPageDefinition.java
deleted file mode 100644
index 9c79dfe..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/page/AtsDecisionPrepareWorkPageDefinition.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.page;
-
-import org.eclipse.osee.ats.artifact.AtsAttributeTypes;
-import org.eclipse.osee.ats.artifact.DecisionReviewState;
-import org.eclipse.osee.ats.workflow.flow.DecisionWorkflowDefinition;
-import org.eclipse.osee.ats.workflow.item.AtsWorkDefinitions;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinition;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageType;
-
-/**
- * @author Donald G. Dunne
- */
-public class AtsDecisionPrepareWorkPageDefinition extends WorkPageDefinition {
-
-   public final static String ID = DecisionWorkflowDefinition.ID + "." + DecisionReviewState.Prepare.getPageName();
-
-   public AtsDecisionPrepareWorkPageDefinition(int ordinal) {
-      this(DecisionReviewState.Prepare.getPageName(), ID, null, ordinal);
-   }
-
-   public AtsDecisionPrepareWorkPageDefinition(String name, String pageId, String parentId, int ordinal) {
-      super(name, pageId, parentId, WorkPageType.Working, ordinal);
-      addWorkItem("ats.Title");
-      addWorkItem(AtsAttributeTypes.DecisionReviewOptions);
-      addWorkItem(AtsWorkDefinitions.ATS_DESCRIPTION_NOT_REQUIRED_ID);
-      addWorkItem(AtsAttributeTypes.RelatedToState);
-      addWorkItem(AtsAttributeTypes.ReviewBlocks);
-      addWorkItem(AtsAttributeTypes.NeedBy);
-      addWorkItem(AtsAttributeTypes.EstimatedHours);
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/page/AtsEndorseWorkPageDefinition.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/page/AtsEndorseWorkPageDefinition.java
deleted file mode 100644
index c0aaed9..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/page/AtsEndorseWorkPageDefinition.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.page;
-
-import org.eclipse.osee.ats.artifact.AtsAttributeTypes;
-import org.eclipse.osee.ats.util.TeamState;
-import org.eclipse.osee.ats.workflow.flow.TeamWorkflowDefinition;
-import org.eclipse.osee.ats.workflow.item.AtsWorkDefinitions.RuleWorkItemId;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinition;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageType;
-
-/**
- * @author Donald G. Dunne
- */
-public class AtsEndorseWorkPageDefinition extends WorkPageDefinition {
-
-   public final static String ID = TeamWorkflowDefinition.ID + "." + TeamState.Endorse.getPageName();
-
-   public AtsEndorseWorkPageDefinition(int ordinal) {
-      this(TeamState.Endorse.getPageName(), ID, null, ordinal);
-   }
-
-   public AtsEndorseWorkPageDefinition(String name, String pageId, String parentId, int ordinal) {
-      super(name, pageId, parentId, WorkPageType.Working, ordinal);
-      addWorkItem(RuleWorkItemId.atsRequireStateHourSpentPrompt.name());
-      addWorkItem("ats.Title");
-      addWorkItem(AtsAttributeTypes.Description);
-      addWorkItem(AtsAttributeTypes.ProposedResolution);
-      addWorkItem(AtsAttributeTypes.ChangeType);
-      addWorkItem(AtsAttributeTypes.PriorityType);
-      addWorkItem(AtsAttributeTypes.NeedBy);
-      addWorkItem(AtsAttributeTypes.ValidationRequired);
-      addWorkItem(AtsAttributeTypes.WorkPackage);
-      addWorkItem(AtsAttributeTypes.UserCommunity);
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/page/AtsGoalInWorkPageDefinition.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/page/AtsGoalInWorkPageDefinition.java
deleted file mode 100644
index 7bf7404..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/page/AtsGoalInWorkPageDefinition.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.page;
-
-import org.eclipse.osee.ats.artifact.AtsAttributeTypes;
-import org.eclipse.osee.ats.artifact.GoalState;
-import org.eclipse.osee.ats.column.EstimatedHoursXWidget;
-import org.eclipse.osee.ats.workflow.flow.GoalWorkflowDefinition;
-import org.eclipse.osee.ats.workflow.item.AtsWorkDefinitions;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinition;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageType;
-
-/**
- * @author Donald G. Dunne
- */
-public class AtsGoalInWorkPageDefinition extends WorkPageDefinition {
-
-   public final static String ID = GoalWorkflowDefinition.ID + "." + GoalState.InWork.getPageName();
-
-   public AtsGoalInWorkPageDefinition(int ordinal) {
-      this(GoalState.InWork.getPageName(), ID, null, ordinal);
-   }
-
-   public AtsGoalInWorkPageDefinition(String name, String pageId, String parentId, int ordinal) {
-      super(name, pageId, parentId, WorkPageType.Working, ordinal);
-      addWorkItem("ats.Title");
-      addWorkItem(AtsWorkDefinitions.ATS_DESCRIPTION_NOT_REQUIRED_ID);
-      addWorkItem(EstimatedHoursXWidget.ATS_ESTIMATED_HOURS_NOT_REQUIRED_ID);
-      addWorkItem(AtsAttributeTypes.GoalOrderVote);
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/page/AtsImplementWorkPageDefinition.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/page/AtsImplementWorkPageDefinition.java
deleted file mode 100644
index 128ab73..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/page/AtsImplementWorkPageDefinition.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.page;
-
-import org.eclipse.osee.ats.artifact.AtsAttributeTypes;
-import org.eclipse.osee.ats.util.TeamState;
-import org.eclipse.osee.ats.workflow.flow.TeamWorkflowDefinition;
-import org.eclipse.osee.ats.workflow.item.AtsWorkDefinitions.RuleWorkItemId;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinition;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageType;
-
-/**
- * @author Donald G. Dunne
- */
-public class AtsImplementWorkPageDefinition extends WorkPageDefinition {
-
-   public final static String ID = TeamWorkflowDefinition.ID + "." + TeamState.Implement.getPageName();
-
-   public AtsImplementWorkPageDefinition(int ordinal) {
-      this(TeamState.Implement.getPageName(), ID, null, ordinal);
-   }
-
-   public AtsImplementWorkPageDefinition(String name, String pageId, String parentId, int ordinal) {
-      super(name, pageId, parentId, WorkPageType.Working, ordinal);
-      addWorkItem(RuleWorkItemId.atsRequireStateHourSpentPrompt.name());
-      addWorkItem(AtsAttributeTypes.WorkPackage);
-      addWorkItem(AtsAttributeTypes.EstimatedCompletionDate);
-      addWorkItem(AtsAttributeTypes.Resolution);
-   }
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/page/AtsPeerPrepareWorkPageDefinition.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/page/AtsPeerPrepareWorkPageDefinition.java
deleted file mode 100644
index 77a477c..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/page/AtsPeerPrepareWorkPageDefinition.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.page;
-
-import org.eclipse.osee.ats.artifact.AtsAttributeTypes;
-import org.eclipse.osee.ats.artifact.PeerToPeerReviewState;
-import org.eclipse.osee.ats.workflow.flow.PeerToPeerWorkflowDefinition;
-import org.eclipse.osee.ats.workflow.item.AtsWorkDefinitions;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinition;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageType;
-
-/**
- * @author Donald G. Dunne
- */
-public class AtsPeerPrepareWorkPageDefinition extends WorkPageDefinition {
-
-   public final static String ID = PeerToPeerWorkflowDefinition.ID + "." + PeerToPeerReviewState.Prepare.getPageName();
-
-   public AtsPeerPrepareWorkPageDefinition(int ordinal) {
-      this(PeerToPeerReviewState.Prepare.getPageName(), ID, null, ordinal);
-   }
-
-   public AtsPeerPrepareWorkPageDefinition(String name, String pageId, String parentId, int ordinal) {
-      super(name, pageId, parentId, WorkPageType.Working, ordinal);
-      addWorkItem("ats.Title");
-      addWorkItem(AtsAttributeTypes.RelatedToState);
-      addWorkItem(AtsAttributeTypes.LegacyPcrId);
-      addWorkItem(AtsAttributeTypes.Role);
-      addWorkItem(AtsAttributeTypes.Location);
-      addWorkItem(AtsWorkDefinitions.ATS_DESCRIPTION_NOT_REQUIRED_ID);
-      addWorkItem(AtsAttributeTypes.RelatedToState);
-      addWorkItem(AtsAttributeTypes.ReviewBlocks);
-      addWorkItem(AtsAttributeTypes.LocChanged);
-      addWorkItem(AtsAttributeTypes.LocReviewed);
-      addWorkItem(AtsAttributeTypes.PagesChanged);
-      addWorkItem(AtsAttributeTypes.PagesReviewed);
-      addWorkItem(AtsAttributeTypes.NeedBy);
-      addWorkItem(AtsAttributeTypes.EstimatedHours);
-   }
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/page/AtsPeerReviewWorkPageDefinition.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/page/AtsPeerReviewWorkPageDefinition.java
deleted file mode 100644
index 1cf7b0a..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/page/AtsPeerReviewWorkPageDefinition.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.page;
-
-import org.eclipse.osee.ats.artifact.AtsAttributeTypes;
-import org.eclipse.osee.ats.artifact.PeerToPeerReviewState;
-import org.eclipse.osee.ats.workflow.flow.PeerToPeerWorkflowDefinition;
-import org.eclipse.osee.ats.workflow.item.AtsWorkDefinitions;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinition;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageType;
-
-/**
- * @author Donald G. Dunne
- */
-public class AtsPeerReviewWorkPageDefinition extends WorkPageDefinition {
-
-   public final static String ID = PeerToPeerWorkflowDefinition.ID + "." + PeerToPeerReviewState.Review.getPageName();
-
-   public AtsPeerReviewWorkPageDefinition(int ordinal) {
-      this(PeerToPeerReviewState.Review.getPageName(), ID, null, ordinal);
-   }
-
-   public AtsPeerReviewWorkPageDefinition(String name, String pageId, String parentId, int ordinal) {
-      super(name, pageId, parentId, WorkPageType.Working, ordinal);
-      addWorkItem(AtsAttributeTypes.Role);
-      addWorkItem(AtsAttributeTypes.ReviewDefect);
-      addWorkItem(AtsAttributeTypes.LocChanged);
-      addWorkItem(AtsAttributeTypes.LocReviewed);
-      addWorkItem(AtsAttributeTypes.PagesChanged);
-      addWorkItem(AtsAttributeTypes.PagesReviewed);
-      addWorkItem(AtsAttributeTypes.Resolution);
-      addWorkItem(AtsWorkDefinitions.ATS_DESCRIPTION_NOT_REQUIRED_ID);
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/page/AtsSimpleInWorkWorkPageDefinition.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/page/AtsSimpleInWorkWorkPageDefinition.java
deleted file mode 100644
index 614af7f..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/page/AtsSimpleInWorkWorkPageDefinition.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.page;
-
-import org.eclipse.osee.ats.artifact.AtsAttributeTypes;
-import org.eclipse.osee.ats.workflow.flow.SimpleWorkflowDefinition;
-import org.eclipse.osee.ats.workflow.flow.SimpleWorkflowDefinition.SimpleState;
-import org.eclipse.osee.ats.workflow.item.AtsWorkDefinitions.RuleWorkItemId;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinition;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageType;
-
-/**
- * @author Donald G. Dunne
- */
-public class AtsSimpleInWorkWorkPageDefinition extends WorkPageDefinition {
-
-   public final static String ID = SimpleWorkflowDefinition.ID + "." + SimpleState.InWork.name();
-
-   public AtsSimpleInWorkWorkPageDefinition(int ordinal) {
-      this(SimpleState.InWork.name(), ID, null, ordinal);
-   }
-
-   public AtsSimpleInWorkWorkPageDefinition(String name, String pageId, String parentId, int ordinal) {
-      super(name, pageId, parentId, WorkPageType.Working, ordinal);
-      addWorkItem(RuleWorkItemId.atsRequireStateHourSpentPrompt.name());
-      addWorkItem(AtsAttributeTypes.Resolution);
-   }
-}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/page/AtsTaskInWorkPageDefinition.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/page/AtsTaskInWorkPageDefinition.java
deleted file mode 100644
index 5b2b0a7..0000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/page/AtsTaskInWorkPageDefinition.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.workflow.page;
-
-import org.eclipse.osee.ats.artifact.AtsAttributeTypes;
-import org.eclipse.osee.ats.artifact.TaskStates;
-import org.eclipse.osee.ats.workflow.flow.TaskWorkflowDefinition;
-import org.eclipse.osee.ats.workflow.item.AtsWorkDefinitions;
-import org.eclipse.osee.ats.workflow.item.AtsWorkDefinitions.RuleWorkItemId;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinition;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageType;
-
-/**
- * @author Donald G. Dunne
- */
-public class AtsTaskInWorkPageDefinition extends WorkPageDefinition {
-
-   public final static String ID = TaskWorkflowDefinition.ID + "." + TaskStates.InWork.getPageName();
-
-   public AtsTaskInWorkPageDefinition(int ordinal) {
-      this(TaskStates.InWork.getPageName(), ID, null, ordinal);
-   }
-
-   public AtsTaskInWorkPageDefinition(String name, String pageId, String parentId, int ordinal) {
-      super(name, pageId, parentId, WorkPageType.Working, ordinal);
-      addWorkItem(RuleWorkItemId.atsRequireStateHourSpentPrompt.name());
-      addWorkItem("ats.Title");
-      addWorkItem(AtsWorkDefinitions.ATS_DESCRIPTION_NOT_REQUIRED_ID);
-      addWorkItem(AtsAttributeTypes.Resolution);
-      addWorkItem(AtsAttributeTypes.EstimatedHours);
-      addWorkItem(AtsAttributeTypes.EstimatedCompletionDate);
-      addWorkItem(AtsAttributeTypes.RelatedToState);
-      addWorkItem(AtsAttributeTypes.SmaNote);
-      addWorkItem(AtsAttributeTypes.Category1);
-   }
-
-}