Index: Riskeer/Integration/src/Riskeer.Integration.IO/Importers/HydraulicBoundaryDatabaseImporter.cs
===================================================================
diff -u -r7305b37ab4bb0119e2f14fced1ff25c8200bfc54 -r0b9da9bf370b5af75d789920b851007feb6cda6f
--- Riskeer/Integration/src/Riskeer.Integration.IO/Importers/HydraulicBoundaryDatabaseImporter.cs	(.../HydraulicBoundaryDatabaseImporter.cs)	(revision 7305b37ab4bb0119e2f14fced1ff25c8200bfc54)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Importers/HydraulicBoundaryDatabaseImporter.cs	(.../HydraulicBoundaryDatabaseImporter.cs)	(revision 0b9da9bf370b5af75d789920b851007feb6cda6f)
@@ -113,8 +113,6 @@
 
         protected override void DoPostImportUpdates()
         {
-            updateHandler.DoPostUpdateActions();
-
             base.DoPostImportUpdates();
 
             foreach (IObservable changedObservable in changedObservables)
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Importers/HydraulicBoundaryDatabaseImporterTest.cs
===================================================================
diff -u -r7305b37ab4bb0119e2f14fced1ff25c8200bfc54 -r0b9da9bf370b5af75d789920b851007feb6cda6f
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Importers/HydraulicBoundaryDatabaseImporterTest.cs	(.../HydraulicBoundaryDatabaseImporterTest.cs)	(revision 7305b37ab4bb0119e2f14fced1ff25c8200bfc54)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Importers/HydraulicBoundaryDatabaseImporterTest.cs	(.../HydraulicBoundaryDatabaseImporterTest.cs)	(revision 0b9da9bf370b5af75d789920b851007feb6cda6f)
@@ -600,7 +600,6 @@
                        observable1,
                        observable2
                    });
-            handler.Expect(h => h.DoPostUpdateActions());
             mocks.ReplayAll();
 
             hydraulicBoundaryData.Attach(hydraulicBoundaryDatabaseObserver);
@@ -618,7 +617,7 @@
         }
 
         [Test]
-        public void DoPostImportUpdates_CancelingImport_DoNotNotifyObserversAndNotDoPostReplacementUpdates()
+        public void DoPostImportUpdates_CancelingImport_DoNotNotifyObservers()
         {
             // Setup
             HydraulicBoundaryData hydraulicBoundaryData = CreateLinkedHydraulicBoundaryData();
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryDataUpdateHandlerTest.cs
===================================================================
diff -u -r7305b37ab4bb0119e2f14fced1ff25c8200bfc54 -r0b9da9bf370b5af75d789920b851007feb6cda6f
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryDataUpdateHandlerTest.cs	(.../HydraulicBoundaryDataUpdateHandlerTest.cs)	(revision 7305b37ab4bb0119e2f14fced1ff25c8200bfc54)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryDataUpdateHandlerTest.cs	(.../HydraulicBoundaryDataUpdateHandlerTest.cs)	(revision 0b9da9bf370b5af75d789920b851007feb6cda6f)
@@ -300,8 +300,7 @@
         [Test]
         public void AddHydraulicBoundaryDatabase_HrdLocationIdsInExcludedLocationIds_LocationsNotAdded()
         {
-            var hydraulicBoundaryData = new HydraulicBoundaryData();
-
+            // Setup
             var mocks = new MockRepository();
             var duneLocationsUpdateHandler = mocks.Stub<IDuneLocationsUpdateHandler>();
             mocks.ReplayAll();
@@ -328,6 +327,8 @@
                 readHydraulicBoundaryLocationsToInclude.Select(l => l.Id),
                 readHydraulicBoundaryDatabase.TrackId);
 
+            var hydraulicBoundaryData = new HydraulicBoundaryData();
+
             // Precondition
             Assert.IsFalse(hydraulicBoundaryData.IsLinked());
 
@@ -574,35 +575,13 @@
             // Setup
             var mocks = new MockRepository();
             var duneLocationsUpdateHandler = mocks.StrictMock<IDuneLocationsUpdateHandler>();
-            duneLocationsUpdateHandler.Stub(h => h.AddLocations(null)).IgnoreArguments();
             duneLocationsUpdateHandler.Expect(h => h.DoPostUpdateActions());
             mocks.ReplayAll();
 
-            const string hrdFilePath = "old/file/path";
             AssessmentSection assessmentSection = CreateAssessmentSection();
-            var hydraulicBoundaryData = new HydraulicBoundaryData
-            {
-                FilePath = hrdFilePath,
-                Version = "1",
-                Locations =
-                {
-                    new TestHydraulicBoundaryLocation("old location 1"),
-                    new TestHydraulicBoundaryLocation("old location 2"),
-                    new TestHydraulicBoundaryLocation("old location 3")
-                }
-            };
 
-            ReadHydraulicBoundaryDatabase readHydraulicBoundaryDatabase = ReadHydraulicBoundaryDatabaseTestFactory.Create();
-
             var handler = new HydraulicBoundaryDataUpdateHandler(assessmentSection, duneLocationsUpdateHandler);
 
-            IEnumerable<IObservable> changedObjects = handler.AddHydraulicBoundaryDatabase(hydraulicBoundaryData, readHydraulicBoundaryDatabase,
-                                                                                           ReadHydraulicLocationConfigurationDatabaseTestFactory.Create(readHydraulicBoundaryDatabase.TrackId),
-                                                                                           Enumerable.Empty<long>(), hrdFilePath);
-
-            // Precondition
-            CollectionAssert.IsNotEmpty(changedObjects);
-
             // Call
             handler.DoPostUpdateActions();