Index: Core/Common/src/Core.Common.Base/Workflow/Activity.cs
===================================================================
diff -u -r2772b7959089c87ccd922ccec53d9f7e01cc02f8 -r5a1cb66da074b1dce5ef4748cde5e34a12bf6211
--- Core/Common/src/Core.Common.Base/Workflow/Activity.cs	(.../Activity.cs)	(revision 2772b7959089c87ccd922ccec53d9f7e01cc02f8)
+++ Core/Common/src/Core.Common.Base/Workflow/Activity.cs	(.../Activity.cs)	(revision 5a1cb66da074b1dce5ef4748cde5e34a12bf6211)
@@ -1,45 +1,26 @@
 using System;
-using System.Collections.Generic;
 using Core.Common.Base.Properties;
-using Core.Common.Utils.Collections.Generic;
 using log4net;
 
 namespace Core.Common.Base.Workflow
 {
     public abstract class Activity : IActivity
     {
-        public string Log { get; set; }
-
         public event EventHandler ProgressChanged;
         private static readonly ILog log = LogManager.GetLogger(typeof(Activity));
         private string progressText;
-        private ActivityStatus status;
 
         protected Activity()
         {
             Log = "";
-            DependsOn = new EventedList<IActivity>();
         }
 
+        public string Log { get; set; }
+
         public virtual string Name { get; set; }
 
-        public virtual IEventedList<IActivity> DependsOn { get; set; }
+        public virtual ActivityStatus Status { get; protected set; }
 
-        public virtual ActivityStatus Status
-        {
-            get
-            {
-                return status;
-            }
-            protected set
-            {
-                if (value != status)
-                {
-                    status = value;
-                }
-            }
-        }
-
         public virtual string ProgressText
         {
             get
@@ -48,11 +29,6 @@
             }
         }
 
-        public virtual IEnumerable<object> GetDirectChildren()
-        {
-            throw new NotImplementedException();
-        }
-
         public virtual void Initialize()
         {
             ChangeState(OnInitialize, ActivityStatus.Initializing, ActivityStatus.Initialized);
@@ -108,7 +84,7 @@
             }
             else
             {
-                ChangeState(OnCleanUp, status, status);
+                ChangeState(OnCleanUp, Status, Status);
             }
         }
 
@@ -117,13 +93,8 @@
             ChangeState(OnFinish, ActivityStatus.Finishing, ActivityStatus.Finished);
         }
 
-        public virtual object DeepClone()
+        protected void OnProgressChanged()
         {
-            throw new NotImplementedException();
-        }
-
-        protected virtual void OnProgressChanged()
-        {
             if (ProgressChanged != null)
             {
                 ProgressChanged(this, EventArgs.Empty);
Index: Core/Common/src/Core.Common.Base/Workflow/ActivityStatus.cs
===================================================================
diff -u -r2a90c0c1be6114f72af65c42f0a6f334b30e4755 -r5a1cb66da074b1dce5ef4748cde5e34a12bf6211
--- Core/Common/src/Core.Common.Base/Workflow/ActivityStatus.cs	(.../ActivityStatus.cs)	(revision 2a90c0c1be6114f72af65c42f0a6f334b30e4755)
+++ Core/Common/src/Core.Common.Base/Workflow/ActivityStatus.cs	(.../ActivityStatus.cs)	(revision 5a1cb66da074b1dce5ef4748cde5e34a12bf6211)
@@ -2,8 +2,6 @@
 {
     /// <summary>
     /// Defines possible states of the activity.
-    /// 
-    /// TODO: migrate to WWF-based implementaiton in .NET 3.5
     /// </summary>
     public enum ActivityStatus
     {
@@ -77,18 +75,4 @@
         /// </summary>
         WaitingForData
     }
-
-    /* 
-    WWF defines the following statuses for Activity:
-    
-    public enum ActivityStatus
-    {
-        Initialized, // Represents the status when an activity is being initialized. 
-        Executing, // Represents the status when an activity is executing. 
-        Canceling, // Represents the status when an activity is in the process of being canceled. 
-        Closed, // Represents the status when an activity is closed. 
-        Compensating, // Represents the status when an activity is compensating. 
-        Faulting // Represents the status when an activity is faulting. 
-    } 
-     */
 }
\ No newline at end of file
Index: Core/Common/src/Core.Common.Base/Workflow/FileImportActivity.cs
===================================================================
diff -u -rb7997551e4a2a68b9d3a91876dc21ae23d594e03 -r5a1cb66da074b1dce5ef4748cde5e34a12bf6211
--- Core/Common/src/Core.Common.Base/Workflow/FileImportActivity.cs	(.../FileImportActivity.cs)	(revision b7997551e4a2a68b9d3a91876dc21ae23d594e03)
+++ Core/Common/src/Core.Common.Base/Workflow/FileImportActivity.cs	(.../FileImportActivity.cs)	(revision 5a1cb66da074b1dce5ef4748cde5e34a12bf6211)
@@ -23,25 +23,6 @@
 
         public string[] Files { get; set; }
 
-        public IFileImporter FileImporter
-        {
-            get
-            {
-                return importer;
-            }
-        }
-
-        /// <summary>
-        /// The target object that is currently imported on.
-        /// </summary>
-        public object Target
-        {
-            get
-            {
-                return target;
-            }
-        }
-
         protected override void OnInitialize()
         {
             if (importer.ShouldCancel)
Index: Core/Common/src/Core.Common.Base/Workflow/IActivity.cs
===================================================================
diff -u -r2772b7959089c87ccd922ccec53d9f7e01cc02f8 -r5a1cb66da074b1dce5ef4748cde5e34a12bf6211
--- Core/Common/src/Core.Common.Base/Workflow/IActivity.cs	(.../IActivity.cs)	(revision 2772b7959089c87ccd922ccec53d9f7e01cc02f8)
+++ Core/Common/src/Core.Common.Base/Workflow/IActivity.cs	(.../IActivity.cs)	(revision 5a1cb66da074b1dce5ef4748cde5e34a12bf6211)
@@ -15,7 +15,7 @@
         /// <summary>
         /// Name of the activity
         /// </summary>
-        string Name { get; set; }
+        string Name { get; }
 
         string Log { get; set; }
 
Index: Core/Common/test/Core.Common.Base.Test/Shell/Core/WorkFlow/ActivityTest.cs
===================================================================
diff -u -r2772b7959089c87ccd922ccec53d9f7e01cc02f8 -r5a1cb66da074b1dce5ef4748cde5e34a12bf6211
--- Core/Common/test/Core.Common.Base.Test/Shell/Core/WorkFlow/ActivityTest.cs	(.../ActivityTest.cs)	(revision 2772b7959089c87ccd922ccec53d9f7e01cc02f8)
+++ Core/Common/test/Core.Common.Base.Test/Shell/Core/WorkFlow/ActivityTest.cs	(.../ActivityTest.cs)	(revision 5a1cb66da074b1dce5ef4748cde5e34a12bf6211)
@@ -16,7 +16,6 @@
             // assert
             Assert.IsInstanceOf<IActivity>(activity);
             Assert.IsNull(activity.Name);
-            CollectionAssert.IsEmpty(activity.DependsOn);
             Assert.AreEqual(ActivityStatus.None, activity.Status);
             Assert.IsNull(activity.ProgressText);
         }
Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs
===================================================================
diff -u -r495647ee1c652fecc15eea7fefeab29ae01347fe -r5a1cb66da074b1dce5ef4748cde5e34a12bf6211
--- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs	(.../PipingCalculationActivityTest.cs)	(revision 495647ee1c652fecc15eea7fefeab29ae01347fe)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs	(.../PipingCalculationActivityTest.cs)	(revision 5a1cb66da074b1dce5ef4748cde5e34a12bf6211)
@@ -28,7 +28,6 @@
             // Assert
             Assert.IsInstanceOf<Activity>(activity);
             Assert.AreEqual(calculation.Name, activity.Name);
-            CollectionAssert.IsEmpty(activity.DependsOn);
             Assert.IsNull(activity.ProgressText);
             Assert.AreEqual(ActivityStatus.None, activity.Status);
         }