Index: Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/ClearCalculationOutputChangeHandlerBase.cs
===================================================================
diff -u -r551adc15997614cd3df87522131fc90f4cd2484a -raad9f6c1881b26d0833fef4f9bb5882f4dc385ed
--- Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/ClearCalculationOutputChangeHandlerBase.cs	(.../ClearCalculationOutputChangeHandlerBase.cs)	(revision 551adc15997614cd3df87522131fc90f4cd2484a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/ClearCalculationOutputChangeHandlerBase.cs	(.../ClearCalculationOutputChangeHandlerBase.cs)	(revision aad9f6c1881b26d0833fef4f9bb5882f4dc385ed)
@@ -32,19 +32,20 @@
     /// <summary>
     /// Base class for handling clearing calculation output.
     /// </summary>
-    public abstract class ClearCalculationOutputChangeHandlerBase : IClearCalculationOutputChangeHandler
+    /// <typeparam name="TCalculation">The type of the calculation.</typeparam>
+    public abstract class ClearCalculationOutputChangeHandlerBase<TCalculation> : IClearCalculationOutputChangeHandler
+        where TCalculation : ICalculation
     {
-        private readonly IEnumerable<ICalculation> calculations;
         private readonly IInquiryHelper inquiryHelper;
 
         /// <summary>
-        /// Creates a new instance of <see cref="ClearCalculationOutputChangeHandlerBase"/>.
+        /// Creates a new instance of <see cref="ClearCalculationOutputChangeHandlerBase{TCalculation}"/>.
         /// </summary>
         /// <param name="calculations">The calculations to clear the output for.</param>
         /// <param name="inquiryHelper">Object responsible for inquiring confirmation.</param>
         /// <param name="viewCommands"></param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        protected ClearCalculationOutputChangeHandlerBase(IEnumerable<ICalculation> calculations, IInquiryHelper inquiryHelper, IViewCommands viewCommands)
+        protected ClearCalculationOutputChangeHandlerBase(IEnumerable<TCalculation> calculations, IInquiryHelper inquiryHelper, IViewCommands viewCommands)
         {
             if (calculations == null)
             {
@@ -61,15 +62,10 @@
                 throw new ArgumentNullException(nameof(viewCommands));
             }
 
-            this.calculations = calculations;
+            Calculations = calculations;
             this.inquiryHelper = inquiryHelper;
             ViewCommands = viewCommands;
         }
-        
-        /// <summary>
-        /// Gets the <see cref="IViewCommands"/>.
-        /// </summary>
-        protected IViewCommands ViewCommands { get; }
 
         public bool InquireConfirmation()
         {
@@ -80,15 +76,25 @@
         {
             DoPreUpdateActions();
 
-            foreach (ICalculation calculation in calculations)
+            foreach (TCalculation calculation in Calculations)
             {
                 calculation.ClearOutput();
             }
 
-            return calculations;
+            return (IEnumerable<IObservable>) Calculations;
         }
 
         /// <summary>
+        /// Gets the calculations.
+        /// </summary>
+        protected IEnumerable<TCalculation> Calculations { get; }
+
+        /// <summary>
+        /// Gets the <see cref="IViewCommands"/>.
+        /// </summary>
+        protected IViewCommands ViewCommands { get; }
+
+        /// <summary>
         /// Performs pre-update actions
         /// </summary>
         protected abstract void DoPreUpdateActions();
Index: Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/StructuresClearCalculationOutputChangeHandler.cs
===================================================================
diff -u
--- Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/StructuresClearCalculationOutputChangeHandler.cs	(revision 0)
+++ Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/StructuresClearCalculationOutputChangeHandler.cs	(revision aad9f6c1881b26d0833fef4f9bb5882f4dc385ed)
@@ -0,0 +1,47 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of Riskeer.
+//
+// Riskeer is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Collections.Generic;
+using Core.Common.Gui.Commands;
+using Core.Common.Gui.Helpers;
+using Core.Common.Util.Extensions;
+using Riskeer.Common.Data.Structures;
+
+namespace Riskeer.Common.Forms.ChangeHandlers
+{
+    /// <summary>
+    /// Class for handling clearing the output of <see cref="StructuresCalculation{T}"/> 
+    /// </summary>
+    /// <typeparam name="TStructuresInput">The type of structures input.</typeparam>
+    public class StructuresClearCalculationOutputChangeHandler<TStructuresInput> : ClearCalculationOutputChangeHandlerBase<StructuresCalculation<TStructuresInput>>
+        where TStructuresInput : IStructuresCalculationInput, new()
+    {
+        public StructuresClearCalculationOutputChangeHandler(
+            IEnumerable<StructuresCalculation<TStructuresInput>> calculations,
+            IInquiryHelper inquiryHelper, IViewCommands viewCommands)
+            : base(calculations, inquiryHelper, viewCommands) {}
+
+        protected override void DoPreUpdateActions()
+        {
+            Calculations.ForEachElementDo(calculation => ViewCommands.RemoveAllViewsForItem(calculation.Output));
+        }
+    }
+}
\ No newline at end of file
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/ChangeHandlers/ClearCalculationOutputChangeHandlerBaseTest.cs
===================================================================
diff -u -r551adc15997614cd3df87522131fc90f4cd2484a -raad9f6c1881b26d0833fef4f9bb5882f4dc385ed
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/ChangeHandlers/ClearCalculationOutputChangeHandlerBaseTest.cs	(.../ClearCalculationOutputChangeHandlerBaseTest.cs)	(revision 551adc15997614cd3df87522131fc90f4cd2484a)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/ChangeHandlers/ClearCalculationOutputChangeHandlerBaseTest.cs	(.../ClearCalculationOutputChangeHandlerBaseTest.cs)	(revision aad9f6c1881b26d0833fef4f9bb5882f4dc385ed)
@@ -39,11 +39,11 @@
         public void Constructor_CalculationsNull_ThrowsArgumentNullException()
         {
             // Setup
-                var mocks = new MockRepository();
-                var inquiryHelper = mocks.Stub<IInquiryHelper>();
-                var viewCommands = mocks.Stub<IViewCommands>();
-                mocks.ReplayAll();
-            
+            var mocks = new MockRepository();
+            var inquiryHelper = mocks.Stub<IInquiryHelper>();
+            var viewCommands = mocks.Stub<IViewCommands>();
+            mocks.ReplayAll();
+
             // Call
             void Call() => new TestClearCalculationOutputChangeHandler(null, inquiryHelper, viewCommands);
 
@@ -60,7 +60,7 @@
             var mocks = new MockRepository();
             var viewCommands = mocks.Stub<IViewCommands>();
             mocks.ReplayAll();
-            
+
             // Call
             void Call() => new TestClearCalculationOutputChangeHandler(Enumerable.Empty<ICalculation>(), null, viewCommands);
 
@@ -111,18 +111,18 @@
         {
             // Setup
             const string expectedInquiry = "Weet u zeker dat u alle uitvoer wilt wissen?";
-            
+
             var mocks = new MockRepository();
             var inquiryHelper = mocks.StrictMock<IInquiryHelper>();
             inquiryHelper.Expect(h => h.InquireContinuation(expectedInquiry)).Return(expectedConfirmation);
             var viewCommands = mocks.Stub<IViewCommands>();
             mocks.ReplayAll();
 
             var changeHandler = new TestClearCalculationOutputChangeHandler(Enumerable.Empty<ICalculation>(), inquiryHelper, viewCommands);
-            
+
             // Call
             bool confirmation = changeHandler.InquireConfirmation();
-            
+
             // Assert
             Assert.AreEqual(expectedConfirmation, confirmation);
             mocks.VerifyAll();
@@ -141,37 +141,37 @@
             calculation2.Expect(c => c.ClearOutput());
             mocks.ReplayAll();
 
-            ICalculation[] calculations = 
+            ICalculation[] calculations =
             {
                 calculation1,
                 calculation2
             };
-            
+
             var changeHandler = new TestClearCalculationOutputChangeHandler(calculations, inquiryHelper, viewCommands);
-            
+
             // Precondition
             Assert.IsFalse(changeHandler.DoPreUpdateActionsExecuted);
 
             // Call
             IEnumerable<IObservable> affectedCalculations = changeHandler.ClearCalculations();
-            
+
             // Assert
             Assert.IsTrue(changeHandler.DoPreUpdateActionsExecuted);
             CollectionAssert.AreEqual(calculations, affectedCalculations);
             mocks.VerifyAll();
         }
-        
-        private class TestClearCalculationOutputChangeHandler : ClearCalculationOutputChangeHandlerBase
+
+        private class TestClearCalculationOutputChangeHandler : ClearCalculationOutputChangeHandlerBase<ICalculation>
         {
-            public TestClearCalculationOutputChangeHandler(IEnumerable<ICalculation> calculations, IInquiryHelper inquiryHelper, IViewCommands viewCommands) 
+            public TestClearCalculationOutputChangeHandler(IEnumerable<ICalculation> calculations, IInquiryHelper inquiryHelper, IViewCommands viewCommands)
                 : base(calculations, inquiryHelper, viewCommands) {}
-            
+
+            public bool DoPreUpdateActionsExecuted { get; private set; }
+
             protected override void DoPreUpdateActions()
             {
                 DoPreUpdateActionsExecuted = true;
             }
-
-            public bool DoPreUpdateActionsExecuted { get; private set; }
-        }   
+        }
     }
 }
\ No newline at end of file
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/ChangeHandlers/StructuresClearCalculationOutputChangeHandlerTest.cs
===================================================================
diff -u
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/ChangeHandlers/StructuresClearCalculationOutputChangeHandlerTest.cs	(revision 0)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/ChangeHandlers/StructuresClearCalculationOutputChangeHandlerTest.cs	(revision aad9f6c1881b26d0833fef4f9bb5882f4dc385ed)
@@ -0,0 +1,87 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of Riskeer.
+//
+// Riskeer is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Linq;
+using Core.Common.Gui.Commands;
+using Core.Common.Gui.Helpers;
+using NUnit.Framework;
+using Rhino.Mocks;
+using Riskeer.Common.Data.Structures;
+using Riskeer.Common.Data.TestUtil;
+using Riskeer.Common.Forms.ChangeHandlers;
+
+namespace Riskeer.Common.Forms.Test.ChangeHandlers
+{
+    [TestFixture]
+    public class StructuresClearCalculationOutputChangeHandlerTest
+    {
+        [Test]
+        public void Constructor_ExpectedValues()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var inquiryHelper = mocks.Stub<IInquiryHelper>();
+            var viewCommands = mocks.Stub<IViewCommands>();
+            mocks.ReplayAll();
+
+            // Call
+            var changeHandler = new StructuresClearCalculationOutputChangeHandler<TestStructuresInput>(
+                Enumerable.Empty<StructuresCalculation<TestStructuresInput>>(), inquiryHelper, viewCommands);
+
+            // Assert
+            Assert.IsInstanceOf<ClearCalculationOutputChangeHandlerBase<StructuresCalculation<TestStructuresInput>>>(changeHandler);
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void GivenChangeHandler_WhenClearingCalculations_ThenViewsClosedForOutputs()
+        {
+            // Given
+            var calculations = new[]
+            {
+                new TestStructuresCalculationScenario
+                {
+                    Output = new TestStructuresOutput()
+                },
+                new TestStructuresCalculationScenario
+                {
+                    Output = new TestStructuresOutput()
+                }
+            };
+
+            var mocks = new MockRepository();
+            var inquiryHelper = mocks.Stub<IInquiryHelper>();
+            var viewCommands = mocks.StrictMock<IViewCommands>();
+            viewCommands.Expect(vc => vc.RemoveAllViewsForItem(calculations[0].Output));
+            viewCommands.Expect(vc => vc.RemoveAllViewsForItem(calculations[1].Output));
+            mocks.ReplayAll();
+
+            var changeHandler = new StructuresClearCalculationOutputChangeHandler<TestStructuresInput>(
+                calculations, inquiryHelper, viewCommands);
+
+            // When
+            changeHandler.ClearCalculations();
+
+            // Then
+            mocks.VerifyAll();
+        }
+    }
+}
\ No newline at end of file