Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs
===================================================================
diff -u -rcd052cca186ce05075f7ccb256ea63610736aa8a -r6821ff075261a98f42221ccc796d007ca11a93fe
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs	(.../PipingGuiPlugin.cs)	(revision cd052cca186ce05075f7ccb256ea63610736aa8a)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs	(.../PipingGuiPlugin.cs)	(revision 6821ff075261a98f42221ccc796d007ca11a93fe)
@@ -239,10 +239,6 @@
 
             treeNodeInfo.ContextMenuStrip = PipingCalculationGroupContextContextMenuStrip;
             treeNodeInfo.OnNodeRemoved = PipingCalculationGroupContextOnNodeRemoved;
-            treeNodeInfo.CanDrag = PipingCalculationGroupContextCanDrag;
-            treeNodeInfo.CanDrop = PipingCalculationGroupContextCanDropOrCanInsert;
-            treeNodeInfo.CanInsert = PipingCalculationGroupContextCanDropOrCanInsert;
-            treeNodeInfo.OnDrop = PipingCalculationGroupContextOnDrop;
 
             return treeNodeInfo;
         }
@@ -836,182 +832,6 @@
             PipingCalculationScenarioService.RemoveCalculationScenarioFromSectionResult(calculation, pipingFailureMechanism);
         }
 
-        private bool PipingCalculationGroupContextCanDrag(PipingCalculationGroupContext nodeData, object parentData)
-        {
-            return !(parentData is PipingFailureMechanismContext);
-        }
-
-        private bool PipingCalculationGroupContextCanDropOrCanInsert(object draggedData, object targetData)
-        {
-            return GetAsICalculationItem(draggedData) != null && NodesHaveSameParentFailureMechanism(draggedData, targetData);
-        }
-
-        private static ICalculationBase GetAsICalculationItem(object item)
-        {
-            var calculationContext = item as PipingCalculationScenarioContext;
-            if (calculationContext != null)
-            {
-                return calculationContext.WrappedData;
-            }
-
-            var groupContext = item as PipingCalculationGroupContext;
-            return groupContext != null ? groupContext.WrappedData : null;
-        }
-
-        private bool NodesHaveSameParentFailureMechanism(object draggedData, object targetData)
-        {
-            var sourceFailureMechanism = GetParentFailureMechanism(draggedData);
-            var targetFailureMechanism = GetParentFailureMechanism(targetData);
-
-            return ReferenceEquals(sourceFailureMechanism, targetFailureMechanism);
-        }
-
-        private static PipingFailureMechanism GetParentFailureMechanism(object data)
-        {
-            var calculationContext = data as PipingCalculationScenarioContext;
-            if (calculationContext != null)
-            {
-                return calculationContext.FailureMechanism;
-            }
-
-            var groupContext = data as PipingCalculationGroupContext;
-            return groupContext != null ? groupContext.FailureMechanism : null;
-        }
-
-        private void PipingCalculationGroupContextOnDrop(object droppedData, object newParentData, object oldParentData, int position, TreeViewControl treeViewControl)
-        {
-            ICalculationBase calculationItem = GetAsICalculationItem(droppedData);
-            var originalOwnerContext = oldParentData as PipingCalculationGroupContext;
-            var target = newParentData as PipingCalculationGroupContext;
-
-            if (calculationItem != null && originalOwnerContext != null && target != null)
-            {
-                var isMoveWithinSameContainer = ReferenceEquals(originalOwnerContext, target);
-
-                DroppingPipingCalculationInContainerStrategy dropHandler = GetDragDropStrategy(isMoveWithinSameContainer, originalOwnerContext, target);
-                dropHandler.Execute(droppedData, calculationItem, position, treeViewControl);
-            }
-        }
-
-        private DroppingPipingCalculationInContainerStrategy GetDragDropStrategy(bool isMoveWithinSameContainer, PipingCalculationGroupContext originalOwnerContext, PipingCalculationGroupContext target)
-        {
-            if (isMoveWithinSameContainer)
-            {
-                return new DroppingPipingCalculationWithinSameContainer(originalOwnerContext, target);
-            }
-            return new DroppingPipingCalculationToNewContainer(originalOwnerContext, target);
-        }
-
-        #region Nested Types: DroppingPipingCalculationInContainerStrategy and implementations
-
-        /// <summary>
-        /// Strategy pattern implementation for dealing with drag & dropping a <see cref="ICalculation"/>
-        /// onto <see cref="CalculationGroup"/> data.
-        /// </summary>
-        private abstract class DroppingPipingCalculationInContainerStrategy
-        {
-            protected readonly PipingCalculationGroupContext target;
-            private readonly PipingCalculationGroupContext originalOwnerContext;
-
-            protected DroppingPipingCalculationInContainerStrategy(PipingCalculationGroupContext originalOwnerContext, PipingCalculationGroupContext target)
-            {
-                this.originalOwnerContext = originalOwnerContext;
-                this.target = target;
-            }
-
-            /// <summary>
-            /// Perform the drag & drop operation.
-            /// </summary>
-            /// <param name="draggedData">The dragged data.</param>
-            /// <param name="calculationBase">The calculation item wrapped by <see cref="draggedData"/>.</param>
-            /// <param name="newPosition">The index of the new position within the new owner's collection.</param>
-            /// <param name="treeViewControl">The tree view control which is at stake.</param>
-            public virtual void Execute(object draggedData, ICalculationBase calculationBase, int newPosition, TreeViewControl treeViewControl)
-            {
-                MoveCalculationItemToNewOwner(calculationBase, newPosition);
-
-                NotifyObservers();
-            }
-
-            /// <summary>
-            /// Moves the <see cref="ICalculationBase"/> instance to its new location.
-            /// </summary>
-            /// <param name="calculationBase">The instance to be relocated.</param>
-            /// <param name="position">The index in the new <see cref="CalculationGroup"/>
-            /// owner within its <see cref="CalculationGroup.Children"/>.</param>
-            protected void MoveCalculationItemToNewOwner(ICalculationBase calculationBase, int position)
-            {
-                originalOwnerContext.WrappedData.Children.Remove(calculationBase);
-                target.WrappedData.Children.Insert(position, calculationBase);
-            }
-
-            /// <summary>
-            /// Notifies observers of the change in state.
-            /// </summary>
-            protected virtual void NotifyObservers()
-            {
-                originalOwnerContext.NotifyObservers();
-            }
-        }
-
-        /// <summary>
-        /// Strategy implementation for rearranging the order of an <see cref="ICalculation"/>
-        /// within a <see cref="CalculationGroup"/> through a drag & drop action.
-        /// </summary>
-        private class DroppingPipingCalculationWithinSameContainer : DroppingPipingCalculationInContainerStrategy
-        {
-            /// <summary>
-            /// Initializes a new instance of the <see cref="DroppingPipingCalculationWithinSameContainer"/> class.
-            /// </summary>
-            /// <param name="originalOwnerContext">The calculation group context that is 
-            /// the original owner of the dragged item.</param>
-            /// <param name="target">The calculation group context that is the target
-            /// of the drag & drop operation.</param>
-            public DroppingPipingCalculationWithinSameContainer(PipingCalculationGroupContext originalOwnerContext, PipingCalculationGroupContext target) :
-                base(originalOwnerContext, target) {}
-        }
-
-        /// <summary>
-        /// Strategy implementation for moving an <see cref="ICalculation"/> from
-        /// one <see cref="CalculationGroup"/> to another using a drag & drop action.
-        /// </summary>
-        private class DroppingPipingCalculationToNewContainer : DroppingPipingCalculationInContainerStrategy
-        {
-            /// <summary>
-            /// Initializes a new instance of the <see cref="DroppingPipingCalculationToNewContainer"/> class.
-            /// </summary>
-            /// <param name="originalOwnerContext">The calculation group context that is 
-            /// the original owner of the dragged item.</param>
-            /// <param name="target">The calculation group context that is the target
-            /// of the drag & drop operation.</param>
-            public DroppingPipingCalculationToNewContainer(PipingCalculationGroupContext originalOwnerContext, PipingCalculationGroupContext target) :
-                base(originalOwnerContext, target) {}
-
-            public override void Execute(object draggedData, ICalculationBase calculationBase, int newPosition, TreeViewControl treeViewControl)
-            {
-                MoveCalculationItemToNewOwner(calculationBase, newPosition);
-
-                NotifyObservers();
-
-                // Try to start a name edit action when an item with the same name was already present
-                if (target.WrappedData.Children.Except(new[]
-                {
-                    calculationBase
-                }).Any(c => c.Name.Equals(calculationBase.Name)))
-                {
-                    treeViewControl.TryRenameNodeForData(draggedData);
-                }
-            }
-
-            protected override void NotifyObservers()
-            {
-                base.NotifyObservers();
-                target.NotifyObservers();
-            }
-        }
-
         #endregion
-
-        #endregion
     }
 }
\ No newline at end of file