Index: Core/Common/src/Core.Common.Base/Workflow/IActivity.cs
===================================================================
diff -u -ree0b95b2a1a34d8e81a21c8d05ef1354169af50c -rc916ecc557054b7f260d2757200dbd3cd99b7d0b
--- Core/Common/src/Core.Common.Base/Workflow/IActivity.cs	(.../IActivity.cs)	(revision ee0b95b2a1a34d8e81a21c8d05ef1354169af50c)
+++ Core/Common/src/Core.Common.Base/Workflow/IActivity.cs	(.../IActivity.cs)	(revision c916ecc557054b7f260d2757200dbd3cd99b7d0b)
@@ -1,7 +1,4 @@
 using System;
-using System.Security.Cryptography.X509Certificates;
-using Core.Common.Utils.Collections.Generic;
-using PostSharp.Aspects.Advices;
 
 namespace Core.Common.Base.Workflow
 {
@@ -13,7 +10,7 @@
     /// <para>Regular workflow for an activity with an error occurring: [Initialize/Execute/Finish] -> ! Exception / Error ! -> Cleanup.</para> 
     /// <para>Regular workflow for an activity being cancelled: [Initialize/Execute/Finish] -> ! Cancel ! -> Cleanup.</para>
     /// </example>
-    public interface IActivity : IProjectItem /* TODO: wrap it with the ProjectItem instead */
+    public interface IActivity
     {
         string Name { get; set; }
 
@@ -28,11 +25,6 @@
         event EventHandler<ActivityStatusChangedEventArgs> StatusChanged;
 
         /// <summary>
-        /// Activity may depend on other activities. Used within <see cref="CompositeActivity"/>.
-        /// </summary>
-        IEventedList<IActivity> DependsOn { get; set; }
-
-        /// <summary>
         /// Returns current status of the activity (executing, cancelling, etc.)
         /// </summary>
         ActivityStatus Status { get; }
Index: Core/Common/uml/Core.Common.Base.UML/Workflow.cd
===================================================================
diff -u -reee6c7815d1e418eac38c1c552fb279c0887ef55 -rc916ecc557054b7f260d2757200dbd3cd99b7d0b
--- Core/Common/uml/Core.Common.Base.UML/Workflow.cd	(.../Workflow.cd)	(revision eee6c7815d1e418eac38c1c552fb279c0887ef55)
+++ Core/Common/uml/Core.Common.Base.UML/Workflow.cd	(.../Workflow.cd)	(revision c916ecc557054b7f260d2757200dbd3cd99b7d0b)
@@ -9,31 +9,10 @@
     <TypeIdentifier />
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="Core.Common.Base.Workflow.CompositeActivity">
-    <Position X="9.25" Y="4" Width="1.75" />
-    <Compartments>
-      <Compartment Name="Fields" Collapsed="true" />
-      <Compartment Name="Methods" Collapsed="true" />
-    </Compartments>
-    <TypeIdentifier />
-    <Lollipop Position="0.2" />
-  </Class>
-  <Class Name="Core.Common.Base.Workflow.ParallelActivity">
-    <Position X="8.5" Y="6.75" Width="1.5" />
-    <TypeIdentifier />
-  </Class>
-  <Class Name="Core.Common.Base.Workflow.SequentialActivity">
-    <Position X="10.5" Y="6.75" Width="1.75" />
-    <TypeIdentifier />
-  </Class>
   <Interface Name="Core.Common.Base.Workflow.IActivity">
     <Position X="2.75" Y="0.5" Width="1.5" />
     <TypeIdentifier />
   </Interface>
-  <Interface Name="Core.Common.Base.Workflow.ICompositeActivity">
-    <Position X="1.25" Y="4.5" Width="1.75" />
-    <TypeIdentifier />
-  </Interface>
   <Enum Name="Core.Common.Base.Workflow.ActivityStatus">
     <Position X="5.5" Y="0.5" Width="1.5" />
     <TypeIdentifier />
Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/Properties/Resources.Designer.cs
===================================================================
diff -u -r293be5aa0c9cfb58fea075f0ce6943fdfb310406 -rc916ecc557054b7f260d2757200dbd3cd99b7d0b
--- Core/Plugins/src/Core.Plugins.CommonTools.Gui/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 293be5aa0c9cfb58fea075f0ce6943fdfb310406)
+++ Core/Plugins/src/Core.Plugins.CommonTools.Gui/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision c916ecc557054b7f260d2757200dbd3cd99b7d0b)
@@ -879,15 +879,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Composite Activity.
-        /// </summary>
-        public static string CompositeActivityProperties_DisplayName {
-            get {
-                return ResourceManager.GetString("CompositeActivityProperties_DisplayName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         public static System.Drawing.Bitmap Control {
Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/Properties/Resources.nl-NL.resx
===================================================================
diff -u -r293be5aa0c9cfb58fea075f0ce6943fdfb310406 -rc916ecc557054b7f260d2757200dbd3cd99b7d0b
--- Core/Plugins/src/Core.Plugins.CommonTools.Gui/Properties/Resources.nl-NL.resx	(.../Resources.nl-NL.resx)	(revision 293be5aa0c9cfb58fea075f0ce6943fdfb310406)
+++ Core/Plugins/src/Core.Plugins.CommonTools.Gui/Properties/Resources.nl-NL.resx	(.../Resources.nl-NL.resx)	(revision c916ecc557054b7f260d2757200dbd3cd99b7d0b)
@@ -333,9 +333,6 @@
   <data name="CommonToolsGuiPlugin_GetContextMenu_Use_Restart" xml:space="preserve">
     <value>NL Use Restart</value>
   </data>
-  <data name="CompositeActivityProperties_DisplayName" xml:space="preserve">
-    <value>NL Composite Activity</value>
-  </data>
   <data name="DataItemProperties_DisplayName" xml:space="preserve">
     <value>NL Data item</value>
   </data>
Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/Properties/Resources.resx
===================================================================
diff -u -r293be5aa0c9cfb58fea075f0ce6943fdfb310406 -rc916ecc557054b7f260d2757200dbd3cd99b7d0b
--- Core/Plugins/src/Core.Plugins.CommonTools.Gui/Properties/Resources.resx	(.../Resources.resx)	(revision 293be5aa0c9cfb58fea075f0ce6943fdfb310406)
+++ Core/Plugins/src/Core.Plugins.CommonTools.Gui/Properties/Resources.resx	(.../Resources.resx)	(revision c916ecc557054b7f260d2757200dbd3cd99b7d0b)
@@ -133,9 +133,6 @@
   <data name="TextDocument" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\resources\textdocument.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="CompositeActivityProperties_DisplayName" xml:space="preserve">
-    <value>Composite Activity</value>
-  </data>
   <data name="Categories_General" xml:space="preserve">
     <value>General</value>
   </data>