Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamProjectData.cs
===================================================================
diff -u -r2111 -r2113
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamProjectData.cs	(.../DamProjectData.cs)	(revision 2111)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamProjectData.cs	(.../DamProjectData.cs)	(revision 2113)
@@ -35,11 +35,9 @@
         private IList<Segment> segments;
         private Dike dike;
         private DamProjectCalculationSpecification damProjectCalculationSpecification;
-        private DikeJob dikeJob;
         private DamProjectType damProjectType = DamProjectType.Operational;
-        private List<LocationJob> jobs = new List<LocationJob>();
         private List<DesignResult> designCalculations;
-        private TimeSerieCollection outputTimeSerieCollection = null;
+        private TimeSerieCollection outputTimeSerieCollection;
         private SensorData sensorData;
         private string calculationMap = "";
         private string projectPath = "";
@@ -77,7 +75,6 @@
         /// </summary>
         public DamProjectData()
         {
-            dikeJob = null;
             damProjectCalculationSpecification = new DamProjectCalculationSpecification();
             dike = new Dike();
             segments = new List<Segment>();
@@ -138,27 +135,6 @@
 
         }
 
-        public virtual DamJob DikeJob
-        {
-            get
-            {
-                if (dikeJob == null)
-                {
-
-                    dikeJob = new DikeJob(dike);
-                    foreach (Location location in dike.Locations)
-                    {
-                        LocationJob locationJob = new LocationJob(location);
-                        dikeJob.Jobs.Add(locationJob);
-                    }
-
-                }
-
-                return dikeJob;
-            }
-            set { dikeJob = value as DikeJob; }
-        }
-
         /// <summary>
         /// Gets or sets the type of the dam project.
         /// </summary>
@@ -170,16 +146,9 @@
             get { return damProjectType; }
             set
             {
-                bool modified = damProjectType != value;
-
                 damProjectType = value;
                 Location.DamProjectType = value;
                 DamFailureMechanismeCalculationSpecification.DamProjectType = value;
-
-                if (modified)
-                {
-                    LocationJob.DamProjectType = damProjectType;
-                }
             }
         }
 
@@ -202,31 +171,6 @@
         }
 
         /// <summary>
-        /// Gets or sets the location jobs.
-        /// </summary>
-        /// <value>
-        /// The location jobs.
-        /// </value>
-        public List<LocationJob> LocationJobs
-        {
-            get
-            {
-                if (jobs.Count == 0 && dikeJob != null)
-                {
-                    foreach (LocationJob locationJob in dikeJob.Jobs)
-                    {
-                        jobs.Add(locationJob);
-                    }
-                }
-                return jobs;
-            }
-            set
-            {
-                jobs = value;
-            }
-        }
-
-        /// <summary>
         /// Gets or sets the project path.
         /// </summary>
         /// <value>