Index: Core/Common/src/Core.Common.Base/Workflow/Activity.cs
===================================================================
diff -u -rb459e67e645683509bed0eb854c2157e1ca12bba -r8b5590674c371d575fba13c92ae1d0f424e9e10f
--- Core/Common/src/Core.Common.Base/Workflow/Activity.cs	(.../Activity.cs)	(revision b459e67e645683509bed0eb854c2157e1ca12bba)
+++ Core/Common/src/Core.Common.Base/Workflow/Activity.cs	(.../Activity.cs)	(revision 8b5590674c371d575fba13c92ae1d0f424e9e10f)
@@ -57,23 +57,17 @@
                     throw new Exception(string.Format(Resources.ActivityRunner_RunActivity_Initialization_of_0_has_failed, Name));
                 }
 
-                while (Status != ActivityStatus.Done)
+                if (Status == ActivityStatus.Cancelled)
                 {
-                    if (Status == ActivityStatus.Cancelled)
-                    {
-                        log.WarnFormat(Resources.ActivityRunner_RunActivity_Execution_of_0_has_been_canceled, Name);
-                        break;
-                    }
+                    log.WarnFormat(Resources.ActivityRunner_RunActivity_Execution_of_0_has_been_canceled, Name);
+                    return;
+                }
 
-                    if (Status != ActivityStatus.WaitingForData)
-                    {
-                        Execute();
-                    }
+                Execute();
 
-                    if (Status == ActivityStatus.Failed)
-                    {
-                        throw new Exception(string.Format(Resources.ActivityRunner_RunActivity_Execution_of_0_has_failed, Name));
-                    }
+                if (Status == ActivityStatus.Failed)
+                {
+                    throw new Exception(string.Format(Resources.ActivityRunner_RunActivity_Execution_of_0_has_failed, Name));
                 }
             }
             catch (Exception exception)
@@ -120,7 +114,6 @@
                 OnProgressChanged();
 
                 if (Status == ActivityStatus.Failed ||
-                    Status == ActivityStatus.Done ||
                     Status == ActivityStatus.Cancelled)
                 {
                     // keep this status
Index: Core/Common/src/Core.Common.Base/Workflow/ActivityStatus.cs
===================================================================
diff -u -r3a68ecde7d4aa9f0e7513e2bb9014a680edfd261 -r8b5590674c371d575fba13c92ae1d0f424e9e10f
--- Core/Common/src/Core.Common.Base/Workflow/ActivityStatus.cs	(.../ActivityStatus.cs)	(revision 3a68ecde7d4aa9f0e7513e2bb9014a680edfd261)
+++ Core/Common/src/Core.Common.Base/Workflow/ActivityStatus.cs	(.../ActivityStatus.cs)	(revision 8b5590674c371d575fba13c92ae1d0f424e9e10f)
@@ -26,18 +26,13 @@
         Executing,
 
         /// <summary>
-        /// Activity has executed. A possible next step could be another execute or finish 
+        /// Activity has executed.
         /// </summary>
         Executed,
 
         /// <summary>
-        /// Activity has executed and done its last execute step
+        /// Activity is finishing.
         /// </summary>
-        Done,
-
-        /// <summary>
-        /// Activity is finishing. 
-        /// </summary>
         Finishing,
 
         /// <summary>
@@ -58,11 +53,6 @@
         /// <summary>
         /// Activity execution has been cancelled.
         /// </summary>
-        Cancelled,
-
-        /// <summary>
-        /// Activity can't progress yet.
-        /// </summary>
-        WaitingForData
+        Cancelled
     }
 }
\ No newline at end of file
Index: Core/Common/src/Core.Common.Base/Workflow/FileImportActivity.cs
===================================================================
diff -u -r3a68ecde7d4aa9f0e7513e2bb9014a680edfd261 -r8b5590674c371d575fba13c92ae1d0f424e9e10f
--- Core/Common/src/Core.Common.Base/Workflow/FileImportActivity.cs	(.../FileImportActivity.cs)	(revision 3a68ecde7d4aa9f0e7513e2bb9014a680edfd261)
+++ Core/Common/src/Core.Common.Base/Workflow/FileImportActivity.cs	(.../FileImportActivity.cs)	(revision 8b5590674c371d575fba13c92ae1d0f424e9e10f)
@@ -47,8 +47,6 @@
                     }
                 }
             }
-
-            Status = ActivityStatus.Done;
         }
 
         protected override void OnCancel()
Index: Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationActivity.cs
===================================================================
diff -u -rb459e67e645683509bed0eb854c2157e1ca12bba -r8b5590674c371d575fba13c92ae1d0f424e9e10f
--- Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationActivity.cs	(.../PipingCalculationActivity.cs)	(revision b459e67e645683509bed0eb854c2157e1ca12bba)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationActivity.cs	(.../PipingCalculationActivity.cs)	(revision 8b5590674c371d575fba13c92ae1d0f424e9e10f)
@@ -42,7 +42,6 @@
         protected override void OnExecute()
         {
             PipingCalculationService.Calculate(calculation);
-            Status = ActivityStatus.Done;
         }
 
         protected override void OnCancel()
Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs
===================================================================
diff -u -rb459e67e645683509bed0eb854c2157e1ca12bba -r8b5590674c371d575fba13c92ae1d0f424e9e10f
--- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs	(.../PipingCalculationActivityTest.cs)	(revision b459e67e645683509bed0eb854c2157e1ca12bba)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs	(.../PipingCalculationActivityTest.cs)	(revision 8b5590674c371d575fba13c92ae1d0f424e9e10f)
@@ -108,7 +108,7 @@
                 StringAssert.StartsWith(String.Format("Berekening van '{0}' gestart om: ", validPipingCalculation.Name), msgs.First());
                 StringAssert.StartsWith(String.Format("Berekening van '{0}' beëindigd om: ", validPipingCalculation.Name), msgs.Last());
             });
-            Assert.AreEqual(ActivityStatus.Done, activity.Status);
+            Assert.AreEqual(ActivityStatus.Executed, activity.Status);
             Assert.IsNotNull(validPipingCalculation.Output);
         }